From 2bf5f68ff2b7b462bfc3ccca9d05f17c33f120a6 Mon Sep 17 00:00:00 2001 From: seanyu Date: Fri, 5 May 2023 16:47:39 +0800 Subject: [PATCH] fix ut --- .../SuccessCircuitBreakerReporterTest.java | 2 -- .../PolarisDiscoveryPropertiesTest.java | 5 +++ .../PolarisAutoServiceRegistrationTest.java | 2 +- ...arisRouterServiceInstanceListSupplier.java | 2 +- .../config/LoadBalancerConfiguration.java | 2 +- .../RpcEnhancementAutoConfiguration.java | 2 +- .../plugin/PolarisEnhancedPluginUtils.java | 2 +- .../assembly/AssemblyMetadataProvider.java | 1 - .../client/AssemblyClientExceptionHook.java | 1 - .../client/AssemblyClientPostHook.java | 1 - .../client/AssemblyClientPreHook.java | 1 - .../server/AssemblyServerExceptionHook.java | 1 - .../server/AssemblyServerPostHook.java | 1 - .../server/AssemblyServerPreHook.java | 1 - .../PolarisInstanceTransformer.java | 1 - .../AssemblyClientExceptionHookTest.java | 3 ++ .../plugin/AssemblyClientPostHookTest.java | 3 ++ .../plugin/AssemblyMetadataProviderTest.java | 35 +++++++++++++++++++ .../plugin/EnhancedPluginContextTest.java | 1 - .../PolarisEnhancedPluginUtilsTest.java | 2 +- 20 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyMetadataProviderTest.java diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/SuccessCircuitBreakerReporterTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/SuccessCircuitBreakerReporterTest.java index 8d751590c..5d50a24c1 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/SuccessCircuitBreakerReporterTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/SuccessCircuitBreakerReporterTest.java @@ -20,8 +20,6 @@ package com.tencent.cloud.polaris.circuitbreaker.reporter; import java.net.URI; import com.tencent.cloud.common.metadata.MetadataContext; -import com.tencent.cloud.common.metadata.StaticMetadataManager; -import com.tencent.cloud.common.metadata.config.MetadataLocalProperties; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java index 5e7b958a4..1a5e875dc 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java @@ -85,10 +85,15 @@ public class PolarisDiscoveryPropertiesTest { polarisDiscoveryProperties.setServiceListRefreshInterval(1000L); assertThat(polarisDiscoveryProperties.getServiceListRefreshInterval()).isEqualTo(1000L); + // InstanceId + polarisDiscoveryProperties.setInstanceId("test-ins-id"); + assertThat(polarisDiscoveryProperties.getInstanceId()).isEqualTo("test-ins-id"); + assertThat(polarisDiscoveryProperties.toString()) .isEqualTo("PolarisDiscoveryProperties{" + "namespace='Test'" + ", service='java_provider_test'" + + ", instanceId='test-ins-id'" + ", token='19485a7674294e3c88dba293373c1534'" + ", weight=10, version='1.0.0'" + ", protocol='HTTP'" diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java index 867a990ec..d66db86b6 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java @@ -75,7 +75,7 @@ public class PolarisAutoServiceRegistrationTest { doNothing().when(serviceRegistry).register(nullable(PolarisRegistration.class)); polarisAutoServiceRegistration = - new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration); + new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration, null); doReturn(environment).when(applicationContext).getEnvironment(); polarisAutoServiceRegistration.setApplicationContext(applicationContext); diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java index 6e1b2d746..ce3a8a9eb 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java @@ -33,9 +33,9 @@ import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.router.resttemplate.PolarisLoadBalancerRequest; -import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor; import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor; +import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.api.exception.ErrorCode; import com.tencent.polaris.api.exception.PolarisException; import com.tencent.polaris.api.pojo.Instance; diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java index 79e10a5b1..ce6ab7304 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java @@ -22,9 +22,9 @@ import java.util.List; import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.polaris.router.PolarisRouterServiceInstanceListSupplier; -import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor; import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor; +import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer; import com.tencent.polaris.router.api.core.RouterAPI; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java index e032c4778..035c2a86a 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java @@ -152,7 +152,7 @@ public class RpcEnhancementAutoConfiguration { protected static class RpcEnhancementServletFilterConfig { @Bean - public FilterRegistrationBean metadataServletFilterRegistrationBean( + public FilterRegistrationBean enhancedServletFilterRegistrationBean( EnhancedServletFilter enhancedServletFilter) { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(enhancedServletFilter); diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java index 819f57f4e..e1556c82d 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java @@ -269,7 +269,7 @@ public final class PolarisEnhancedPluginUtils { LOG.error("unsupported charset exception " + UTF_8, e); } try { - return new ObjectMapper().readValue(label, new TypeReference>() {}); + return new ObjectMapper().readValue(label, new TypeReference>() { }); } catch (JsonProcessingException e) { LOG.error("parse label map exception", e); diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java index 63fbeed1e..7c8b1401c 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java @@ -1,6 +1,5 @@ package com.tencent.cloud.rpc.enhancement.plugin.assembly; -import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.polaris.api.pojo.ServiceKey; import com.tencent.polaris.api.rpc.MetadataProvider; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java index a2642beec..d445d31a0 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java @@ -27,7 +27,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext; import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.AfterRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java index 65160dca0..44570c7e4 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java @@ -27,7 +27,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext; import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.AfterRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java index 029f69a8f..412ee00ac 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java @@ -24,7 +24,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.BeforeRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java index 9c479d861..1ce15b4a7 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java @@ -26,7 +26,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvide import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.AfterRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java index 3b7653066..151f51fd6 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java @@ -26,7 +26,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvide import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.AfterRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java index d83477082..d90c1882d 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java @@ -24,7 +24,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider; import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext; import com.tencent.polaris.api.pojo.ServiceKey; -import com.tencent.polaris.api.rpc.RequestContext; import com.tencent.polaris.assembly.api.AssemblyAPI; import com.tencent.polaris.assembly.api.pojo.BeforeRequest; import com.tencent.polaris.assembly.api.pojo.Capability; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java index 8f0909d32..a44ef3a56 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java @@ -19,7 +19,6 @@ package com.tencent.cloud.rpc.enhancement.transformer; import com.tencent.cloud.common.pojo.PolarisServiceInstance; -import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.api.pojo.DefaultInstance; import org.springframework.cloud.client.ServiceInstance; diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientExceptionHookTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientExceptionHookTest.java index e887fc676..9a4b7e6b2 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientExceptionHookTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientExceptionHookTest.java @@ -6,6 +6,7 @@ import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.plugin.assembly.client.AssemblyClientExceptionHook; +import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.assembly.api.AssemblyAPI; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -38,6 +39,8 @@ public class AssemblyClientExceptionHookTest { private AssemblyClientExceptionHook assemblyClientExceptionHook; @Mock private AssemblyAPI assemblyAPI; + @Mock + private InstanceTransformer instanceTransformer; @BeforeAll static void beforeAll() { diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientPostHookTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientPostHookTest.java index 2753d8b40..7403781fb 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientPostHookTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientPostHookTest.java @@ -6,6 +6,7 @@ import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.plugin.assembly.client.AssemblyClientPostHook; +import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer; import com.tencent.polaris.assembly.api.AssemblyAPI; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -38,6 +39,8 @@ public class AssemblyClientPostHookTest { private AssemblyClientPostHook assemblyClientPostHook; @Mock private AssemblyAPI assemblyAPI; + @Mock + private InstanceTransformer instanceTransformer; @BeforeAll static void beforeAll() { diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyMetadataProviderTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyMetadataProviderTest.java new file mode 100644 index 000000000..94bd4a6d3 --- /dev/null +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyMetadataProviderTest.java @@ -0,0 +1,35 @@ +package com.tencent.cloud.rpc.enhancement.plugin; + +import java.util.HashMap; +import java.util.Map; + +import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider; +import com.tencent.polaris.api.pojo.ServiceKey; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import org.springframework.cloud.client.ServiceInstance; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doReturn; + +@ExtendWith(MockitoExtension.class) +public class AssemblyMetadataProviderTest { + + @Test + public void testAssemblyMetadataProvider() { + ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class); + Map metadata = new HashMap<>() {{ + put("k", "v"); + }}; + doReturn(metadata).when(serviceInstance).getMetadata(); + doReturn("0.0.0.0").when(serviceInstance).getHost(); + doReturn("test").when(serviceInstance).getServiceId(); + AssemblyMetadataProvider assemblyMetadataProvider = new AssemblyMetadataProvider(serviceInstance, "test"); + assertThat(assemblyMetadataProvider.getMetadata("k")).isEqualTo("v"); + assertThat(assemblyMetadataProvider.getLocalIp()).isEqualTo("0.0.0.0"); + assertThat(assemblyMetadataProvider.getLocalService()).isEqualTo(new ServiceKey("test", "test")); + } +} diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/EnhancedPluginContextTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/EnhancedPluginContextTest.java index b1c593f3f..0e9824911 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/EnhancedPluginContextTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/EnhancedPluginContextTest.java @@ -42,7 +42,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.serviceregistry.Registration; -import org.springframework.context.annotation.Bean; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java index b52d2d843..6b0006da6 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java @@ -98,7 +98,7 @@ public class PolarisEnhancedPluginUtilsTest { HttpHeaders requestHeaders = new HttpHeaders(); requestHeaders.add(RouterConstant.ROUTER_LABEL_HEADER, "{\"k1\":\"v1\"}"); - assertThat(PolarisEnhancedPluginUtils.getLabelMap(requestHeaders)).isEqualTo(new HashMap(){{ + assertThat(PolarisEnhancedPluginUtils.getLabelMap(requestHeaders)).isEqualTo(new HashMap() {{ put("k1", "v1"); }});