msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

feat:upgrade to 2023.0.6. (#1646)

Browse Source
pull/1648/head
Haotian Zhang 2 months ago committed by GitHub
parent 6371548d90
commit 5f462b0cd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 114 additions and 122 deletions
Show Stats Download Patch File Download Diff File

3
CHANGELOG.md
Unescape View File

@ -2,4 +2,5 @@
---
- [fix:fix PolarisContextProperties instantiated twice causing NPE.](https://github.com/Tencent/spring-cloud-tencent/pull/1641)
- [feat: support tsf 2024.](https://github.com/Tencent/spring-cloud-tencent/pull/1645)
- [feat: support tsf gw.](https://github.com/Tencent/spring-cloud-tencent/pull/1645)
- [feat:upgrade to 2023.0.6.](https://github.com/Tencent/spring-cloud-tencent/pull/1646)

10
pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.5</version>
<version>4.1.6</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -90,16 +90,16 @@
<properties>
<!-- Project revision -->
<revision>2.0.3.0-2023.0.5-SNAPSHOT</revision>
<revision>2.1.0.0-2023.0.6-SNAPSHOT</revision>
<!-- Spring Framework -->
<spring.framework.version>6.1.20</spring.framework.version>
<spring.framework.version>6.1.21</spring.framework.version>
<!-- Spring Boot -->
<spring.boot.version>3.3.12</spring.boot.version>
<spring.boot.version>3.3.13</spring.boot.version>
<!-- Spring Cloud -->
<spring.cloud.version>2023.0.5</spring.cloud.version>
<spring.cloud.version>2023.0.6</spring.cloud.version>
<!-- Maven Plugin Versions -->
<jacoco.version>0.8.12</jacoco.version>

9
spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerTest.java
Unescape View File

@ -30,7 +30,6 @@ import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementAutoConfiguration;
import com.tencent.polaris.client.util.Utils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -101,16 +100,16 @@ public class PolarisCircuitBreakerTest {
Method getConfigurationsMethod = ReflectionUtils.findMethod(PolarisCircuitBreakerFactory.class,
"getConfigurations");
Assertions.assertNotNull(getConfigurationsMethod);
assertThat(getConfigurationsMethod).isNotNull();
ReflectionUtils.makeAccessible(getConfigurationsMethod);
Map<?, ?> values = (Map<?, ?>) ReflectionUtils.invokeMethod(getConfigurationsMethod, polarisCircuitBreakerFactory);
Assertions.assertNotNull(values);
assertThat(values).isNotNull();
Assertions.assertEquals(1, values.size());
assertThat(values.size()).isEqualTo(1);
Utils.sleepUninterrupted(10 * 1000);
Assertions.assertEquals(0, values.size());
assertThat(values.size()).isEqualTo(0);
});
}

15
spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCodeTest.java
Unescape View File

@ -19,13 +19,14 @@ package com.tencent.cloud.polaris.circuitbreaker.common;
import java.lang.reflect.Method;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Test for ${@link PolarisResultToErrorCode}.
*
@ -38,7 +39,7 @@ class PolarisResultToErrorCodeTest {
@Test
void testOnSuccess() {
Assertions.assertEquals(200, converter.onSuccess("any value"));
assertThat(converter.onSuccess("any value")).isEqualTo(200);
}
@Test
@ -51,7 +52,7 @@ class PolarisResultToErrorCodeTest {
int errorCode = converter.onError(exception);
// Then
Assertions.assertEquals(404, errorCode);
assertThat(errorCode).isEqualTo(404);
}
@Test
@ -60,7 +61,7 @@ class PolarisResultToErrorCodeTest {
int errorCode = converter.onError(new RuntimeException("test"));
// Then
Assertions.assertEquals(-1, errorCode);
assertThat(errorCode).isEqualTo(-1);
}
@Test
@ -72,7 +73,7 @@ class PolarisResultToErrorCodeTest {
int errorCode = converter.onError(exception);
// Then
Assertions.assertEquals(-1, errorCode);
assertThat(errorCode).isEqualTo(-1);
}
@Test
@ -85,10 +86,10 @@ class PolarisResultToErrorCodeTest {
// test exist class
boolean result1 = (boolean) checkClassExist.invoke(converter, "java.lang.String");
Assertions.assertTrue(result1);
assertThat(result1).isTrue();
// test not exist class
boolean result2 = (boolean) checkClassExist.invoke(converter, "com.nonexistent.Class");
Assertions.assertFalse(result2);
assertThat(result2).isFalse();
}
}

28
spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerInvocationHandlerTest.java
Unescape View File

@ -28,7 +28,6 @@ import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;
import feign.InvocationHandlerFactory;
import feign.Target;
import feign.codec.Decoder;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -37,6 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.cloud.openfeign.FallbackFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@ -84,20 +84,20 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
@Test
void testConstructorWithNullTarget() {
Assertions.assertThrows(NullPointerException.class, () ->
assertThatThrownBy(() ->
new PolarisFeignCircuitBreakerInvocationHandler(
null, dispatch, fallbackFactory, decoder
)
);
).isExactlyInstanceOf(NullPointerException.class);
}
@Test
void testConstructorWithNullDispatch() {
Assertions.assertThrows(NullPointerException.class, () ->
assertThatThrownBy(() ->
new PolarisFeignCircuitBreakerInvocationHandler(
target, null, fallbackFactory, decoder
)
);
).isExactlyInstanceOf(NullPointerException.class);
}
@Test
@ -108,9 +108,9 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
Map<Method, Method> result = PolarisFeignCircuitBreakerInvocationHandler.toFallbackMethod(testDispatch);
Assertions.assertNotNull(result);
Assertions.assertTrue(result.containsKey(method));
Assertions.assertEquals(method, result.get(method));
assertThat(result).isNotNull();
assertThat(result.containsKey(method)).isTrue();
assertThat(result.get(method)).isEqualTo(method);
}
@Test
@ -119,10 +119,10 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
Object mockProxy = mock(Object.class);
// Test equals with null
Assertions.assertFalse((Boolean) handler.invoke(mockProxy, equalsMethod, new Object[] {null}));
assertThat((Boolean) handler.invoke(mockProxy, equalsMethod, new Object[] {null})).isFalse();
// Test equals with non-proxy object
Assertions.assertFalse((Boolean) handler.invoke(mockProxy, equalsMethod, new Object[] {new Object()}));
assertThat((Boolean) handler.invoke(mockProxy, equalsMethod, new Object[] {new Object()})).isFalse();
}
@Test
@ -131,7 +131,7 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
Object mockProxy = mock(Object.class);
when(target.toString()).thenReturn("TestTarget");
Assertions.assertEquals("TestTarget", handler.invoke(mockProxy, toStringMethod, null));
assertThat(handler.invoke(mockProxy, toStringMethod, null)).isEqualTo("TestTarget");
}
@Test
@ -178,7 +178,7 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
Object result = handler.invoke(null, testMethod, new Object[] {});
// Verify
Assertions.assertEquals(expected, result);
assertThat(result).isEqualTo(expected);
}
@Test
@ -190,8 +190,8 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest {
decoder
);
Assertions.assertEquals(handler, testHandler);
Assertions.assertEquals(handler.hashCode(), testHandler.hashCode());
assertThat(testHandler).isEqualTo(handler);
assertThat(testHandler.hashCode()).isEqualTo(handler.hashCode());
}
interface TestInterface {

18
spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerTest.java
Unescape View File

@ -20,12 +20,12 @@ package com.tencent.cloud.polaris.circuitbreaker.instrument.feign;
import feign.Feign;
import feign.RequestLine;
import feign.Target;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.openfeign.FallbackFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -45,7 +45,7 @@ public class PolarisFeignCircuitBreakerTest {
@Test
public void testBuilderNotNull() {
Assertions.assertNotNull(builder);
assertThat(builder).isNotNull();
}
@Test
@ -67,8 +67,8 @@ public class PolarisFeignCircuitBreakerTest {
MyService result = builder.target(target, fallback);
// Verify that the result is not null and the fallback factory is used
Assertions.assertNotNull(result);
Assertions.assertEquals("Fallback Hello", result.sayHello());
assertThat(result).isNotNull();
assertThat(result.sayHello()).isEqualTo("Fallback Hello");
}
@Test
@ -93,8 +93,8 @@ public class PolarisFeignCircuitBreakerTest {
MyService result = builder.target(target, fallbackFactory);
// Verify that the result is not null and the fallback factory is used
Assertions.assertNotNull(result);
Assertions.assertEquals("Fallback Hello", result.sayHello());
assertThat(result).isNotNull();
assertThat(result.sayHello()).isEqualTo("Fallback Hello");
}
@Test
@ -112,8 +112,7 @@ public class PolarisFeignCircuitBreakerTest {
MyService result = builder.target(target);
// Verify that the result is not null
Assertions.assertNotNull(result);
// Additional verifications can be added here based on the implementation
assertThat(result).isNotNull();
}
@Test
@ -122,8 +121,7 @@ public class PolarisFeignCircuitBreakerTest {
Feign feign = builder.build(null);
// Verify that the Feign instance is not null
Assertions.assertNotNull(feign);
// Additional verifications can be added here based on the implementation
assertThat(feign).isNotNull();
}
public interface MyService {

54
spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/resttemplate/PolarisCircuitBreakerHttpResponseTest.java
Unescape View File

@ -23,11 +23,13 @@ import java.util.HashMap;
import java.util.Map;
import com.tencent.polaris.api.pojo.CircuitBreakerStatus;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
/**
* Tests for {@link PolarisCircuitBreakerHttpResponse}.
*
@ -39,10 +41,10 @@ public class PolarisCircuitBreakerHttpResponseTest {
void testConstructorWithCodeOnly() throws IOException {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200);
Assertions.assertEquals(200, response.getStatusCode().value());
Assertions.assertNotNull(response.getHeaders());
Assertions.assertTrue(response.getHeaders().isEmpty());
Assertions.assertNull(response.getBody());
assertThat(response.getStatusCode().value()).isEqualTo(200);
assertThat(response.getHeaders()).isNotNull();
assertThat(response.getHeaders()).isEmpty();
assertThat(response.getBody()).isNull();
}
@Test
@ -50,10 +52,10 @@ public class PolarisCircuitBreakerHttpResponseTest {
String body = "test body";
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200, body);
Assertions.assertEquals(200, response.getStatusCode().value());
Assertions.assertNotNull(response.getHeaders());
Assertions.assertTrue(response.getHeaders().isEmpty());
Assertions.assertNotNull(response.getBody());
assertThat(response.getStatusCode().value()).isEqualTo(200);
assertThat(response.getHeaders()).isNotNull();
assertThat(response.getHeaders()).isEmpty();
assertThat(response.getBody()).isNotNull();
}
@Test
@ -65,12 +67,12 @@ public class PolarisCircuitBreakerHttpResponseTest {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200, headers, body);
Assertions.assertEquals(200, response.getStatusCode().value());
Assertions.assertNotNull(response.getHeaders());
Assertions.assertEquals(2, response.getHeaders().size());
Assertions.assertTrue(response.getHeaders().containsKey("Content-Type"));
Assertions.assertTrue(response.getHeaders().containsKey("Authorization"));
Assertions.assertNotNull(response.getBody());
assertThat(response.getStatusCode().value()).isEqualTo(200);
assertThat(response.getHeaders()).isNotNull();
assertThat(response.getHeaders().size()).isEqualTo(2);
assertThat(response.getHeaders()).containsKey("Content-Type");
assertThat(response.getHeaders()).containsKey("Authorization");
assertThat(response.getBody()).isNotNull();
}
@Test
@ -81,43 +83,43 @@ public class PolarisCircuitBreakerHttpResponseTest {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(fallbackInfo);
Assertions.assertEquals(200, response.getStatusCode().value());
Assertions.assertEquals(fallbackInfo, response.getFallbackInfo());
Assertions.assertNotNull(response.getHeaders());
Assertions.assertTrue(response.getHeaders().containsKey("Content-Type"));
Assertions.assertNotNull(response.getBody());
assertThat(response.getStatusCode().value()).isEqualTo(200);
assertThat(response.getFallbackInfo()).isEqualTo(fallbackInfo);
assertThat(response.getHeaders()).isNotNull();
assertThat(response.getHeaders()).containsKey("Content-Type");
assertThat(response.getBody()).isNotNull();
}
@Test
void testGetStatusTextWithValidHttpStatus() {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200);
Assertions.assertEquals("OK", response.getStatusText());
assertThat(response.getStatusText()).isEqualTo("OK");
}
@Test
void testGetStatusTextWithInvalidHttpStatus() {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(999);
Assertions.assertEquals("", response.getStatusText());
assertThat(response.getStatusText()).isEqualTo("");
}
@Test
void testClose() {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200, "test body");
InputStream body = response.getBody();
Assertions.assertNotNull(body);
assertThat(body).isNotNull();
response.close();
// Verify that reading from closed stream throws exception
Assertions.assertDoesNotThrow(() -> body.read());
assertThatNoException().isThrownBy(() -> body.read());
}
@Test
void testCloseWithNullBody() {
PolarisCircuitBreakerHttpResponse response = new PolarisCircuitBreakerHttpResponse(200);
Assertions.assertNull(response.getBody());
assertThat(response.getBody()).isNull();
// Should not throw exception when closing null body
Assertions.assertDoesNotThrow(() -> response.close());
assertThatNoException().isThrownBy(() -> response.close());
}
}

30
spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java
Unescape View File

@ -33,7 +33,6 @@ import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.configuration.api.core.ConfigFileService;
import com.tencent.polaris.configuration.api.core.ConfigKVFile;
import com.tencent.polaris.configuration.client.internal.RevisableConfigFileGroup;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -354,21 +353,20 @@ public class PolarisConfigFileLocatorTest {
testProperties.setCheckAddress(checkAddress);
testProperties.setShutdownIfConnectToConfigServerFailed(shutdownIfConnectToConfigServerFailed);
Assertions.assertEquals(enabled, testProperties.isEnabled());
Assertions.assertEquals(address, testProperties.getAddress());
Assertions.assertEquals(port, testProperties.getPort());
Assertions.assertEquals(token, testProperties.getToken());
Assertions.assertEquals(autoRefresh, testProperties.isAutoRefresh());
Assertions.assertEquals(refreshType, testProperties.getRefreshType());
Assertions.assertEquals(groups, testProperties.getGroups());
Assertions.assertEquals(preference, testProperties.isPreference());
Assertions.assertEquals(dataSource, testProperties.getDataSource());
Assertions.assertEquals(localFileRootPath, testProperties.getLocalFileRootPath());
Assertions.assertEquals(internalEnabled, testProperties.isInternalEnabled());
Assertions.assertEquals(checkAddress, testProperties.isCheckAddress());
Assertions.assertEquals(shutdownIfConnectToConfigServerFailed, testProperties.isShutdownIfConnectToConfigServerFailed());
Assertions.assertNotNull(testProperties.toString());
assertThat(testProperties.isEnabled()).isEqualTo(enabled);
assertThat(testProperties.getAddress()).isEqualTo(address);
assertThat(testProperties.getPort()).isEqualTo(port);
assertThat(testProperties.getToken()).isEqualTo(token);
assertThat(testProperties.isAutoRefresh()).isEqualTo(autoRefresh);
assertThat(testProperties.getRefreshType()).isEqualTo(refreshType);
assertThat(testProperties.getGroups()).isEqualTo(groups);
assertThat(testProperties.isPreference()).isEqualTo(preference);
assertThat(testProperties.getDataSource()).isEqualTo(dataSource);
assertThat(testProperties.getLocalFileRootPath()).isEqualTo(localFileRootPath);
assertThat(testProperties.isInternalEnabled()).isEqualTo(internalEnabled);
assertThat(testProperties.isCheckAddress()).isEqualTo(checkAddress);
assertThat(testProperties.isShutdownIfConnectToConfigServerFailed()).isEqualTo(shutdownIfConnectToConfigServerFailed);
assertThat(testProperties.toString()).isNotNull();
}
private void clearCompositePropertySourceCache() {

3
spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterBootstrapAutoConfigurationTest.java
Unescape View File

@ -26,7 +26,6 @@ import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
import com.tencent.polaris.factory.ConfigAPIFactory;
import com.tencent.polaris.factory.config.ConfigurationImpl;
import com.tencent.polaris.plugins.router.nearby.NearbyRouterConfig;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
@ -60,7 +59,7 @@ public class RouterBootstrapAutoConfigurationTest {
routerConfigModifier.modify((ConfigurationImpl) configuration);
NearbyRouterConfig nearbyRouterConfig = configuration.getConsumer().getServiceRouter().getPluginConfig(
ServiceRouterConfig.DEFAULT_ROUTER_NEARBY, NearbyRouterConfig.class);
Assertions.assertEquals("CAMPUS", nearbyRouterConfig.getMatchLevel().name());
assertThat(nearbyRouterConfig.getMatchLevel().name()).isEqualTo("CAMPUS");
});
}
}

6
spring-cloud-tencent-dependencies/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>4.1.5</version>
<version>4.1.6</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -71,10 +71,10 @@
<properties>
<!-- Project revision -->
<revision>2.0.3.0-2023.0.5-SNAPSHOT</revision>
<revision>2.1.0.0-2023.0.6-SNAPSHOT</revision>
<!-- Polaris SDK version -->
<polaris.version>2.0.3.0-SNAPSHOT</polaris.version>
<polaris.version>2.1.0.0-SNAPSHOT</polaris.version>
<!-- Dependencies -->
<springdoc.version>2.2.0</springdoc.version>

8
spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest.java
Unescape View File

@ -17,7 +17,6 @@
package com.tencent.cloud.plugin.gateway;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
@ -28,6 +27,7 @@ import org.springframework.cloud.gateway.filter.ReactiveLoadBalancerClientFilter
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.context.ApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -62,7 +62,7 @@ public class PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest {
@Test
void testGetOrder() {
int order = processor.getOrder();
Assertions.assertEquals(PolarisReactiveLoadBalancerClientFilterBeanPostProcessor.ORDER, order);
assertThat(order).isEqualTo(PolarisReactiveLoadBalancerClientFilterBeanPostProcessor.ORDER);
}
@Test
@ -75,7 +75,7 @@ public class PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest {
Object result = processor.postProcessAfterInitialization(originalInterceptor, beanName);
// Assert
Assertions.assertInstanceOf(PolarisReactiveLoadBalancerClientFilter.class, result);
assertThat(result).isInstanceOf(PolarisReactiveLoadBalancerClientFilter.class);
}
@Test
@ -88,7 +88,7 @@ public class PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest {
Object result = processor.postProcessAfterInitialization(originalBean, beanName);
// Assert
Assertions.assertSame(originalBean, result);
assertThat(result).isSameAs(originalBean);
}
}

10
spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterTest.java
Unescape View File

@ -20,7 +20,6 @@ package com.tencent.cloud.plugin.gateway;
import com.tencent.cloud.common.constant.MetadataConstant;
import com.tencent.cloud.common.metadata.MetadataContext;
import com.tencent.cloud.common.metadata.MetadataContextHolder;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -44,6 +43,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class PolarisReactiveLoadBalancerClientFilterTest {
private final MetadataContext testContext = new MetadataContext();
@Mock
private LoadBalancerClientFactory clientFactory;
@Mock
@ -54,9 +54,7 @@ class PolarisReactiveLoadBalancerClientFilterTest {
private ServerWebExchange exchange;
@Mock
private GatewayFilterChain chain;
private PolarisReactiveLoadBalancerClientFilter polarisFilter;
private final MetadataContext testContext = new MetadataContext();
@BeforeEach
void setUp() {
@ -82,11 +80,11 @@ class PolarisReactiveLoadBalancerClientFilterTest {
when(originalFilter.filter(exchange, chain))
.thenReturn(Mono.empty());
MetadataContext before = MetadataContextHolder.get();
Assertions.assertNotEquals(testContext, before);
assertThat(before).isNotEqualTo(testContext);
// Act
polarisFilter.filter(exchange, chain);
MetadataContext after = MetadataContextHolder.get();
Assertions.assertEquals(testContext, after);
assertThat(after).isEqualTo(testContext);
}
@Test
@ -102,6 +100,6 @@ class PolarisReactiveLoadBalancerClientFilterTest {
MetadataContext after = MetadataContextHolder.get();
// Assert
Assertions.assertEquals(before, after);
assertThat(after).isEqualTo(before);
}
}

15
spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextGatewayPropertiesManagerTest.java
Unescape View File

@ -24,7 +24,6 @@ import java.util.Map;
import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClient;
import com.tencent.cloud.polaris.discovery.reactive.PolarisReactiveDiscoveryClient;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@ -127,7 +126,8 @@ class ContextGatewayPropertiesManagerTest {
ContextGatewayFilter filter = new ContextGatewayFilter(manager, null);
MockServerHttpRequest request = MockServerHttpRequest.post("http://localhost/context/testNS/testSvc/api/exact").build();
MockServerHttpRequest request = MockServerHttpRequest.post("http://localhost/context/testNS/testSvc/api/exact")
.build();
String[] apis = filter.rebuildMsApi(request, group, request.getPath().value());
// Test path matching
@ -223,7 +223,6 @@ class ContextGatewayPropertiesManagerTest {
"POST|/headerNS/svcFromHeader/api/test",
"/api/test");
}
private void testPositionCombination(ApiType apiType, Position namespacePos, Position servicePos,
@ -287,19 +286,19 @@ class ContextGatewayPropertiesManagerTest {
void testGroupContext() {
GroupContext group1 = new GroupContext();
group1.setComment("testComment");
Assertions.assertEquals("testComment", group1.getComment());
assertThat(group1.getComment()).isEqualTo("testComment");
GroupContext.ContextPredicate contextPredicate = new GroupContext.ContextPredicate();
contextPredicate.setContext("testContext");
Assertions.assertEquals("testContext", contextPredicate.getContext());
assertThat(contextPredicate.getContext()).isEqualTo("testContext");
GroupContext.ContextRoute contextRoute = new GroupContext.ContextRoute();
contextRoute.setPathMapping("testPathMapping");
Assertions.assertEquals("testPathMapping", contextRoute.getPathMapping());
assertThat(contextRoute.getPathMapping()).isEqualTo("testPathMapping");
contextRoute.setHost("testHost");
Assertions.assertEquals("testHost", contextRoute.getHost());
assertThat(contextRoute.getHost()).isEqualTo("testHost");
contextRoute.setMetadata(Collections.singletonMap("testKey", "testValue"));
Assertions.assertEquals(1, contextRoute.getMetadata().size());
assertThat(contextRoute.getMetadata().size()).isEqualTo(1);
}
}

7
spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextRoutePredicateFactoryTest.java
Unescape View File

@ -17,7 +17,6 @@
package com.tencent.cloud.plugin.gateway.context;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@ -48,7 +47,7 @@ class ContextRoutePredicateFactoryTest {
// Act
ContextRoutePredicateFactory.Config config = factory.newConfig();
config.setGroup("g1");
Assertions.assertEquals("g1", config.getGroup());
assertThat(config.getGroup()).isEqualTo("g1");
GatewayPredicate gatewayPredicate = (GatewayPredicate) factory.apply(config);
gatewayPredicate.toString();
@ -57,8 +56,8 @@ class ContextRoutePredicateFactoryTest {
MockServerHttpRequest.get("/test").build());
exchange.getAttributes().put(GATEWAY_PREDICATE_PATH_CONTAINER_ATTR, "mock");
Assertions.assertTrue(gatewayPredicate.test(exchange));
Assertions.assertEquals(config, gatewayPredicate.getConfig());
assertThat(gatewayPredicate.test(exchange)).isTrue();
assertThat(gatewayPredicate.getConfig()).isEqualTo(config);
});
}

6
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/beanprocessor/BlockingLoadBalancerClientBeanPostProcessorTest.java
Unescape View File

@ -18,7 +18,6 @@
package com.tencent.cloud.rpc.enhancement.beanprocessor;
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginRunner;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
@ -28,6 +27,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerRequestFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
/**
@ -73,7 +73,7 @@ class BlockingLoadBalancerClientBeanPostProcessorTest {
Object result = processor.postProcessBeforeInitialization(originalBean, beanName);
// Assert
Assertions.assertSame(originalBean, result);
assertThat(result).isSameAs(originalBean);
}
@Test
@ -82,6 +82,6 @@ class BlockingLoadBalancerClientBeanPostProcessorTest {
int order = processor.getOrder();
// Assert
Assertions.assertEquals(BlockingLoadBalancerClientBeanPostProcessor.ORDER, order);
assertThat(order).isEqualTo(BlockingLoadBalancerClientBeanPostProcessor.ORDER);
}
}

6
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/scg/EnhancedGatewayGlobalFilterTest.java
Unescape View File

@ -42,7 +42,6 @@ import com.tencent.polaris.client.api.SDKContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -177,9 +176,8 @@ public class EnhancedGatewayGlobalFilterTest {
EnhancedGatewayGlobalFilter filter = new EnhancedGatewayGlobalFilter(pluginRunner);
// Act & Assert
Assertions.assertThrows(CallAbortedException.class, () -> {
filter.filter(exchange, chain);
});
assertThatThrownBy(() -> filter.filter(exchange, chain))
.isExactlyInstanceOf(CallAbortedException.class);
}
@Test

3
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/webclient/EnhancedWebClientExchangeFilterFunctionTest.java
Unescape View File

@ -36,7 +36,6 @@ import com.tencent.polaris.api.pojo.CircuitBreakerStatus;
import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;
import com.tencent.polaris.client.api.SDKContext;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -170,7 +169,7 @@ public class EnhancedWebClientExchangeFilterFunctionTest {
// Assert
StepVerifier.create(responseMono)
.expectNextMatches(response -> {
Assertions.assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.statusCode());
assertThat(response.statusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
assertThat(response.headers().asHttpHeaders().containsKey("header-key")).isTrue();
return true;
})

5
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/DefaultEnhancedPluginRunnerTest.java
Unescape View File

@ -20,13 +20,14 @@ package com.tencent.cloud.rpc.enhancement.plugin;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.cloud.client.serviceregistry.Registration;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link DefaultEnhancedPluginRunner}.
*
@ -48,7 +49,7 @@ public class DefaultEnhancedPluginRunnerTest {
Registration result = DefaultEnhancedPluginRunner.getPolarisRegistration(registrations);
// Assert
Assertions.assertSame(normalReg, result);
assertThat(result).isSameAs(normalReg);
}
// Helper method to create mock Registration objects

Write Preview
Loading…
Cancel
Save