fix unit test failures

Author: nobodyiam

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigMonitorInitializerTest.java

@@ -20,6 +20,7 @@
 import com.ctrip.framework.apollo.monitor.internal.ApolloClientMonitorContext;
 import com.ctrip.framework.apollo.monitor.internal.exporter.ApolloClientMetricsExporterFactory;
 import com.ctrip.framework.apollo.util.ConfigUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -49,6 +50,11 @@ public void setUp() {
 		resetConfigMonitorInitializer();
 	}
 
+	@After
+	public void tearDown() throws Exception {
+		MockInjector.reset();
+	}
+
 	@Test
 	public void testInitializeWhenMonitorEnabledAndNotInitialized() {
 		when(mockConfigUtil.isClientMonitorEnabled()).thenReturn(true);

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java

@@ -24,6 +24,7 @@
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -81,6 +82,11 @@ public void setUp() {
         k8sConfigMapConfigRepository = new K8sConfigMapConfigRepository(someAppId, someNamespace, upstreamRepo);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        MockInjector.reset();
+    }
+
     /**
      * 测试setConfigMapKey方法，当cluster和namespace都为正常值时
      */

apollo-client/src/test/java/com/ctrip/framework/apollo/kubernetes/KubernetesManagerTest.java

@@ -23,6 +23,7 @@
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
 import io.kubernetes.client.openapi.models.V1PodList;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -60,6 +61,11 @@ public void setUp() {
         MockInjector.setInstance(CoreV1Api.class, coreV1Api);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        MockInjector.reset();
+    }
+
     /**
      * 测试 createConfigMap 成功创建配置
      */

apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/DefaultConfigMonitorTest.java

@@ -24,6 +24,7 @@
 import com.ctrip.framework.apollo.monitor.api.ApolloClientNamespaceMonitorApi;
 import com.ctrip.framework.apollo.monitor.api.ApolloClientThreadPoolMonitorApi;
 import com.ctrip.framework.apollo.monitor.internal.exporter.ApolloClientMetricsExporter;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -57,7 +58,11 @@ public void setUp(){
     MockInjector.setInstance(ApolloClientMonitorContext.class, monitorContext);
 
     configMonitor = new DefaultConfigMonitor();
+  }
 
+  @After
+  public void tearDown() throws Exception {
+    MockInjector.reset();
   }
 
   @Test

apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/event/ApolloClientMonitorEventPublisherTest.java

@@ -22,6 +22,7 @@
 import com.ctrip.framework.apollo.monitor.internal.listener.ApolloClientMonitorEventListener;
 import com.ctrip.framework.apollo.monitor.internal.ApolloClientMonitorContext;
 import com.ctrip.framework.apollo.util.ConfigUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,6 +48,11 @@ public void setUp() {
     ApolloClientMonitorEventPublisher.reset();
   }
 
+  @After
+  public void tearDown() throws Exception {
+    MockInjector.reset();
+  }
+
   @Test
   public void testPublish_WhenClientMonitorEnabled_CollectorSupportsEvent() {
     when(mockConfigUtil.isClientMonitorEnabled()).thenReturn(true);

apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/exporter/DefaultApolloClientMetricsExporterFactoryTest.java

@@ -23,6 +23,7 @@
 import com.ctrip.framework.apollo.monitor.internal.exporter.impl.DefaultApolloClientMetricsExporterFactory;
 import com.ctrip.framework.apollo.monitor.internal.listener.ApolloClientMonitorEventListener;
 import com.ctrip.framework.apollo.util.ConfigUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -48,6 +49,11 @@ public void setUp() {
     factory = new DefaultApolloClientMetricsExporterFactory();
   }
 
+  @After
+  public void tearDown() throws Exception {
+    MockInjector.reset();
+  }
+
   @Test
   public void testGetMetricsReporter_NoExternalSystemType() {
     when(configUtil.getMonitorExternalType()).thenReturn(null);