This is an automated email from the ASF dual-hosted git repository.
rainyu pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 92fcc7847d Fix several tests in dubbo-config-spring beans module
(#15834)
92fcc7847d is described below
commit 92fcc7847d45cef7c229f53839de054bd2da5947
Author: Anshul Bisht <[email protected]>
AuthorDate: Thu Jan 15 06:37:30 2026 -0600
Fix several tests in dubbo-config-spring beans module (#15834)
---
.../annotation/DubboConfigAliasPostProcessorTest.java | 18 ++++++++++++++++++
.../factory/annotation/MethodConfigCallbackTest.java | 8 +++++++-
.../ReferenceAnnotationBeanPostProcessorTest.java | 2 ++
.../annotation/ServiceAnnotationPostProcessorTest.java | 2 ++
...onfigDefaultPropertyValueBeanPostProcessorTest.java | 18 ++++++++++++++++++
.../config/MultipleServicesWithMethodConfigsTest.java | 2 ++
6 files changed, 49 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessorTest.java
index 2d5c74094c..010b6f7c88 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessorTest.java
@@ -17,9 +17,13 @@
package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+import org.apache.dubbo.config.spring.SysProps;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+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.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -30,6 +34,20 @@ class DubboConfigAliasPostProcessorTest {
private static final String APP_NAME = "APP_NAME";
private static final String APP_ID = "APP_ID";
+ @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 test() {
AnnotationConfigApplicationContext context = new
AnnotationConfigApplicationContext(TestConfigurationX.class);
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MethodConfigCallbackTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MethodConfigCallbackTest.java
index 907141f2c3..9fa44b1418 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MethodConfigCallbackTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MethodConfigCallbackTest.java
@@ -48,7 +48,13 @@ import static org.awaitility.Awaitility.await;
MethodConfigCallbackTest.class,
MethodConfigCallbackTest.MethodCallbackConfiguration.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 MethodConfigCallbackTest {
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
index 851ebf9a8b..c68cb9ccfd 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
@@ -77,6 +77,8 @@ import static
org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
properties = {
"consumer.version = ${demo.service.version}",
"consumer.url = dubbo://127.0.0.1:12345?version=2.5.7",
+ "dubbo.metrics.enabled = false",
+ "dubbo.metrics.protocol = disabled"
})
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
class ReferenceAnnotationBeanPostProcessorTest {
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
index 9c51b1f74a..5c74058bff 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
@@ -54,6 +54,8 @@ import static
org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
@TestPropertySource(
properties = {
"provider.package =
org.apache.dubbo.config.spring.context.annotation.provider",
+ "dubbo.metrics.enabled = false",
+ "dubbo.metrics.protocol = disabled"
})
@EnableDubbo(scanBasePackages = "${provider.package}")
class ServiceAnnotationPostProcessorTest {
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessorTest.java
index ddb3af0d7d..36b30a184e 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessorTest.java
@@ -18,14 +18,32 @@ package org.apache.dubbo.config.spring.beans.factory.config;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
+import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+import org.apache.dubbo.config.spring.SysProps;
import
org.apache.dubbo.config.spring.context.annotation.provider.ProviderConfiguration;
+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.annotation.AnnotationConfigApplicationContext;
class DubboConfigDefaultPropertyValueBeanPostProcessorTest {
+ @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 test() {
AnnotationConfigApplicationContext context =
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/MultipleServicesWithMethodConfigsTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/MultipleServicesWithMethodConfigsTest.java
index d78568bd9c..937167cb30 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/MultipleServicesWithMethodConfigsTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/MultipleServicesWithMethodConfigsTest.java
@@ -30,6 +30,7 @@ import org.springframework.context.ApplicationContext;
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;
@@ -38,6 +39,7 @@ import static
org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
@ContextConfiguration(classes = MultipleServicesWithMethodConfigsTest.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@ImportResource(locations =
"classpath:/META-INF/spring/multiple-services-with-methods.xml")
+@TestPropertySource(properties = {"dubbo.metrics.enabled = false",
"dubbo.metrics.protocol = disabled"})
class MultipleServicesWithMethodConfigsTest {
@BeforeAll
