fix potential test error issue

nobodyiam · nobodyiam · commit 041fdf4b3997 · 2022-12-27T14:48:28.000+08:00
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java
@@ -17,6 +17,7 @@
 package com.ctrip.framework.apollo;
 
 import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.core.MetaDomainConsts;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.concurrent.TimeUnit;
@@ -43,6 +44,7 @@
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
+import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * @author Jason Song(song_s@ctrip.com)
@@ -90,6 +92,7 @@ public void tearDown() throws Exception {
     //as ConfigService is singleton, so we must manually clear its container
     ConfigService.reset();
     MockInjector.reset();
+    ReflectionTestUtils.invokeMethod(MetaDomainConsts.class, "reset");
 
     if (server != null && server.isStarted()) {
       server.stop();
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/ConfigServiceTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/ConfigServiceTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.ctrip.framework.apollo.core.MetaDomainConsts;
 import com.ctrip.framework.apollo.enums.ConfigSourceType;
 import java.util.Set;
 
@@ -31,6 +32,7 @@
 import com.ctrip.framework.apollo.internals.AbstractConfig;
 import com.ctrip.framework.apollo.spi.ConfigFactory;
 import com.ctrip.framework.apollo.util.ConfigUtil;
+import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * @author Jason Song(song_s@ctrip.com)
@@ -50,6 +52,7 @@ public void tearDown() throws Exception {
     //as ConfigService is singleton, so we must manually clear its container
     ConfigService.reset();
     MockInjector.reset();
+    ReflectionTestUtils.invokeMethod(MetaDomainConsts.class, "reset");
   }
 
   @Test
diff --git a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java
@@ -229,4 +229,12 @@ public void run() {
       }
     }, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
   }
+
+  // for test only
+  static void reset() {
+    metaServerAddressCache.clear();
+    selectedMetaServerAddressCache.clear();
+    metaServerProviders = null;
+    periodicRefreshStarted.set(false);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -229,4 +229,12 @@ public void run() {`
`229`	`229`	`}`
`230`	`230`	`}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);`
`231`	`231`	`}`
	`232`	`+`
	`233`	`+ // for test only`
	`234`	`+ static void reset() {`
	`235`	`+ metaServerAddressCache.clear();`
	`236`	`+ selectedMetaServerAddressCache.clear();`
	`237`	`+ metaServerProviders = null;`
	`238`	`+ periodicRefreshStarted.set(false);`
	`239`	`+ }`
`232`	`240`	`}`