From 525c21b33dc4537d05295cffd10146156493b407 Mon Sep 17 00:00:00 2001 From: shuiqingliu Date: Wed, 29 Jun 2022 15:58:14 +0800 Subject: [PATCH] fix: unit test failed caused by merge code --- .../polaris/config/endpoint/PolarisConfigEndpointTests.java | 2 -- .../polaris/endpoint/PolarisDiscoveryEndPointTests.java | 5 +---- .../endpoint/PolarisRateLimitRuleEndpointTests.java | 5 +---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpointTests.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpointTests.java index 6dcf10d56..55607f02d 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpointTests.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpointTests.java @@ -56,8 +56,6 @@ public class PolarisConfigEndpointTests { @Test public void polarisConfigEndpoint() { - when(polarisConfigProperties.isAutoRefresh()).thenReturn(true); - Map content = new HashMap<>(); content.put("k1", "v1"); diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPointTests.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPointTests.java index f54b34a31..41bdc94f5 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPointTests.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPointTests.java @@ -21,7 +21,6 @@ package com.tencent.cloud.polaris.endpoint; import java.util.Map; import com.tencent.cloud.polaris.PolarisDiscoveryProperties; -import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClient; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClientConfiguration; @@ -53,12 +52,10 @@ public class PolarisDiscoveryEndPointTests { private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() .withConfiguration(AutoConfigurations.of( - PolarisContextAutoConfiguration.class, PolarisDiscoveryEndPointTests.PolarisPropertiesConfiguration.class, PolarisDiscoveryClientConfiguration.class, PolarisDiscoveryAutoConfiguration.class, - PolarisDiscoveryEndpointAutoConfiguration.class, - PolarisContextAutoConfiguration.class)) + PolarisDiscoveryEndpointAutoConfiguration.class)) .withPropertyValues("spring.application.name=" + SERVICE_PROVIDER) .withPropertyValues("server.port=" + PORT) .withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081") diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java index 8bfb78fd1..bb9ad8cda 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java @@ -20,7 +20,6 @@ package com.tencent.cloud.polaris.ratelimit.endpoint; import java.util.Map; import com.google.protobuf.StringValue; -import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration; import com.tencent.cloud.polaris.context.ServiceRuleManager; import com.tencent.cloud.polaris.ratelimit.config.PolarisRateLimitProperties; import com.tencent.polaris.client.pb.ModelProto; @@ -54,12 +53,10 @@ public class PolarisRateLimitRuleEndpointTests { private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() .withConfiguration(AutoConfigurations.of( - PolarisContextAutoConfiguration.class, PolarisRateLimitRuleEndpointTests.PolarisRateLimitAutoConfiguration.class, PolarisRateLimitRuleEndpointAutoConfiguration.class, PolarisRateLimitAutoConfiguration.class, - PolarisRateLimitAutoConfiguration.class, - PolarisContextAutoConfiguration.class)) + PolarisRateLimitAutoConfiguration.class)) .withPropertyValues("spring.application.name=" + SERVICE_PROVIDER) .withPropertyValues("server.port=" + PORT) .withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")