diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/DubboConfigBeanInitializerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/DubboConfigBeanInitializerTest.java index 97d1df45c1f0..afcbe207abef 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/DubboConfigBeanInitializerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/DubboConfigBeanInitializerTest.java @@ -51,7 +51,13 @@ DubboConfigBeanInitializerTest.class, DubboConfigBeanInitializerTest.AppConfiguration.class, }) -@TestPropertySource(properties = {"dubbo.protocol.port=-1", "dubbo.registry.address=${zookeeper.connection.address}"}) +@TestPropertySource( + properties = { + "dubbo.protocol.port=-1", + "dubbo.registry.address=${zookeeper.connection.address}", + "dubbo.metrics.enabled = false", + "dubbo.metrics.protocol = disabled" + }) @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) class DubboConfigBeanInitializerTest { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/registryNA/consumer/DubboXmlConsumerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/registryNA/consumer/DubboXmlConsumerTest.java index b3a786476731..20d88a4398e6 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/registryNA/consumer/DubboXmlConsumerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/registryNA/consumer/DubboXmlConsumerTest.java @@ -16,14 +16,32 @@ */ package org.apache.dubbo.config.spring.reference.registryNA.consumer; +import org.apache.dubbo.config.bootstrap.DubboBootstrap; +import org.apache.dubbo.config.spring.SysProps; import org.apache.dubbo.config.spring.api.HelloService; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; class DubboXmlConsumerTest { + @BeforeEach + void setUp() { + DubboBootstrap.reset(); + SysProps.clear(); + SysProps.setProperty("dubbo.metrics.enabled", "false"); + SysProps.setProperty("dubbo.metrics.protocol", "disabled"); + } + + @AfterEach + void tearDown() { + DubboBootstrap.reset(); + SysProps.clear(); + } + @Test void testConsumer() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java index 25e932fb092b..83aff3e15e82 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.ImportResource; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -42,6 +43,7 @@ @ContextConfiguration(classes = GenericServiceTest.class) @DirtiesContext(classMode = AFTER_EACH_TEST_METHOD) @ImportResource(locations = "classpath:/META-INF/spring/dubbo-generic-consumer.xml") +@TestPropertySource(properties = {"dubbo.metrics.enabled = false", "dubbo.metrics.protocol = disabled"}) class GenericServiceTest { @BeforeAll diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceWithoutInterfaceTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceWithoutInterfaceTest.java index 6d74fab5414c..6672a4a5d232 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceWithoutInterfaceTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceWithoutInterfaceTest.java @@ -31,6 +31,7 @@ import org.springframework.context.annotation.ImportResource; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD; @@ -39,6 +40,7 @@ @ContextConfiguration(classes = GenericServiceWithoutInterfaceTest.class) @DirtiesContext(classMode = AFTER_EACH_TEST_METHOD) @ImportResource(locations = "classpath:/META-INF/spring/dubbo-generic-consumer-without-interface.xml") +@TestPropertySource(properties = {"dubbo.metrics.enabled = false", "dubbo.metrics.protocol = disabled"}) class GenericServiceWithoutInterfaceTest { @BeforeAll