From f4f90b9ee6417f486c0ee9227ab11081cc43cc1c Mon Sep 17 00:00:00 2001 From: xinbolu2 Date: Sun, 19 Nov 2023 11:36:07 -0600 Subject: [PATCH] Fix 7 order-dependent tests by adding a precondition --- .../configdata/NacosConfigDataLocationResolverTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLocationResolverTest.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLocationResolverTest.java index 7928af2256..85f7b1cfa0 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLocationResolverTest.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLocationResolverTest.java @@ -63,6 +63,12 @@ public class NacosConfigDataLocationResolverTest { @BeforeEach void setup() { this.environment = new MockEnvironment(); + environment.setProperty("spring.cloud.nacos.username", "root"); + environment.setProperty("spring.cloud.nacos.password", "root"); + environment.setProperty("spring.cloud.nacos.config.password", "not_root"); + environment.setProperty("spring.cloud.nacos.server-addr", "127.0.0.1:8888"); + environment.setProperty("spring.cloud.nacos.config.server-addr", + "127.0.0.1:9999"); this.environmentBinder = Binder.get(this.environment); this.resolver = new NacosConfigDataLocationResolver(new DeferredLogs()); when(bootstrapContext.isRegistered(eq(ConfigService.class))).thenReturn(true); @@ -166,7 +172,10 @@ void testUrisInLocationShouldOverridesProperty() { void testSetCommonPropertiesIsOK() { environment.setProperty("spring.cloud.nacos.username", "root"); environment.setProperty("spring.cloud.nacos.password", "root"); + environment.setProperty("spring.cloud.nacos.config.password", "root"); environment.setProperty("spring.cloud.nacos.server-addr", "127.0.0.1:8888"); + environment.setProperty("spring.cloud.nacos.config.server-addr", + "127.0.0.1:8888"); String locationUri = "nacos:test.yml"; List resources = testUri(locationUri);