From 7560f5b035956d0284558e8335f30051cc52150d Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 30 Jan 2025 10:31:05 +0800 Subject: [PATCH 1/2] bump version to 2.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a255aabd..3a51d516 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ - 2.4.0-SNAPSHOT + 2.4.0 1.8 UTF-8 2.7.18 From 8172f7d3e38b21daba9efae59a39f65b23ba83dc Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 30 Jan 2025 11:11:18 +0800 Subject: [PATCH 2/2] fix unit test failures --- .../apollo/internals/ConfigMonitorInitializerTest.java | 6 ++++++ .../apollo/internals/K8sConfigMapConfigRepositoryTest.java | 6 ++++++ .../framework/apollo/kubernetes/KubernetesManagerTest.java | 6 ++++++ .../apollo/monitor/internal/DefaultConfigMonitorTest.java | 5 +++++ .../event/ApolloClientMonitorEventPublisherTest.java | 6 ++++++ .../DefaultApolloClientMetricsExporterFactoryTest.java | 6 ++++++ 6 files changed, 35 insertions(+) diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigMonitorInitializerTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigMonitorInitializerTest.java index 25be1005..fc69df37 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigMonitorInitializerTest.java +++ b/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); diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java index 6a0fe102..e5409558 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java +++ b/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都为正常值时 */ diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/kubernetes/KubernetesManagerTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/kubernetes/KubernetesManagerTest.java index f8c3acee..12700ab9 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/kubernetes/KubernetesManagerTest.java +++ b/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 成功创建配置 */ diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/DefaultConfigMonitorTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/DefaultConfigMonitorTest.java index 870b54c3..7330f4d1 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/DefaultConfigMonitorTest.java +++ b/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 diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/event/ApolloClientMonitorEventPublisherTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/event/ApolloClientMonitorEventPublisherTest.java index 04241217..6fde8a7a 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/event/ApolloClientMonitorEventPublisherTest.java +++ b/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); diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/exporter/DefaultApolloClientMetricsExporterFactoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/exporter/DefaultApolloClientMetricsExporterFactoryTest.java index bce2079d..5c8ee829 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/monitor/internal/exporter/DefaultApolloClientMetricsExporterFactoryTest.java +++ b/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);