diff --git a/.github/workflows/junit.yml b/.github/workflows/junit.yml index 69cf87f8e..dba534a3f 100644 --- a/.github/workflows/junit.yml +++ b/.github/workflows/junit.yml @@ -68,9 +68,9 @@ jobs: needs: set-jdks steps: - name: Checkout codes - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -85,7 +85,7 @@ jobs: run: mvn clean test -B -U -Psonatype - name: Upload coverage to Codecov if: matrix.os == 'ubuntu-latest' && matrix.java == 17 - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 595e9f7c2..eb5d0bbcb 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -30,6 +30,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codes - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Check License Header uses: apache/skywalking-eyes@v0.4.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae2a08218..79cfb9d04 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,9 +8,9 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ef4e16065..01e159116 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -21,7 +21,7 @@ jobs: IS_SNAPSHOT: ${{ steps.check-deploy-type.outputs.IS_SNAPSHOT }} steps: - name: Checkout codes - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Check deploy type id: check-deploy-type run: | @@ -65,9 +65,9 @@ jobs: if: ${{ needs.check-snapshot.outputs.IS_SNAPSHOT == 'true' }} steps: - name: Checkout codes - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up JDK ${{ needs.set-jdk.outputs.jdk }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ needs.set-jdk.outputs.jdk }} distribution: 'temurin' diff --git a/CHANGELOG.md b/CHANGELOG.md index f720b3d46..d98eddddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,3 +7,4 @@ - [feat:support async metadata transfer.](https://github.com/Tencent/spring-cloud-tencent/pull/1743) - [fix:replace with string inside @ConditionalOnClass.](https://github.com/Tencent/spring-cloud-tencent/pull/1750) - [feat: support TagUtils, ContextToHeaderInterceptor in TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1754) +- [deps:upgrade to spring boot 3.4.12.](https://github.com/Tencent/spring-cloud-tencent/pull/1756) diff --git a/pom.xml b/pom.xml index a5852f6eb..46e3587c6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1 + 4.2.3 4.0.0 @@ -93,10 +93,10 @@ 2.1.1.0-2024.0.2-SNAPSHOT - 6.2.9 + 6.2.14 - 3.4.8 + 3.4.12 2024.0.2 @@ -106,7 +106,6 @@ 0.8.12 - 1.3.0 3.4.0 0.8.0 @@ -278,7 +277,6 @@ org.codehaus.mojo flatten-maven-plugin - ${flatten-maven-plugin.version} true resolveCiFriendliesOnly diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerTest.java index 53ed84928..c26ce958a 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerTest.java @@ -31,7 +31,6 @@ import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementAutoConfiguration; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementPropertiesAutoConfiguration; 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; @@ -103,16 +102,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).hasSize(1); Utils.sleepUninterrupted(10 * 1000); - Assertions.assertEquals(0, values.size()); + assertThat(values).hasSize(0); }); } diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCodeTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCodeTest.java index 41f65317b..bc81b104e 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCodeTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCodeTest.java @@ -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,11 @@ 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(); } } diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerInvocationHandlerTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerInvocationHandlerTest.java index d95e5bf73..092af6e21 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerInvocationHandlerTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerInvocationHandlerTest.java @@ -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,7 +36,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.cloud.openfeign.FallbackFactory; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -84,20 +84,16 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest { @Test void testConstructorWithNullTarget() { - Assertions.assertThrows(NullPointerException.class, () -> - new PolarisFeignCircuitBreakerInvocationHandler( - null, dispatch, fallbackFactory, decoder - ) - ); + assertThatThrownBy( + () -> new PolarisFeignCircuitBreakerInvocationHandler(null, dispatch, fallbackFactory, decoder)) + .isInstanceOf(NullPointerException.class); } @Test void testConstructorWithNullDispatch() { - Assertions.assertThrows(NullPointerException.class, () -> - new PolarisFeignCircuitBreakerInvocationHandler( - target, null, fallbackFactory, decoder - ) - ); + assertThatThrownBy(() -> + new PolarisFeignCircuitBreakerInvocationHandler(target, null, fallbackFactory, decoder)) + .isInstanceOf(NullPointerException.class); } @Test @@ -108,9 +104,9 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest { Map 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); + assertThat(result.get(method)).isEqualTo(method); } @Test @@ -119,10 +115,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 +127,7 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest { Object mockProxy = mock(Object.class); when(target.toString()).thenReturn("TestTarget"); - Assertions.assertEquals("TestTarget", handler.invoke(mockProxy, toStringMethod, null)); + assertThat((String) handler.invoke(mockProxy, toStringMethod, null)).isEqualTo("TestTarget"); } @Test @@ -178,7 +174,7 @@ class PolarisFeignCircuitBreakerInvocationHandlerTest { Object result = handler.invoke(null, testMethod, new Object[] {}); // Verify - Assertions.assertEquals(expected, result); + assertThat(result).isEqualTo(expected); } @Test @@ -190,8 +186,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 { diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerTest.java index 46be28f21..ad9bdccb5 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/feign/PolarisFeignCircuitBreakerTest.java @@ -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 { diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/resttemplate/PolarisCircuitBreakerHttpResponseTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/resttemplate/PolarisCircuitBreakerHttpResponseTest.java index 806c7b626..2ef04245e 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/resttemplate/PolarisCircuitBreakerHttpResponseTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/instrument/resttemplate/PolarisCircuitBreakerHttpResponseTest.java @@ -23,11 +23,14 @@ 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.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * Tests for {@link PolarisCircuitBreakerHttpResponse}. * @@ -39,10 +42,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 +53,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 +68,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,44 +84,44 @@ 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); //SCT 2024 will throw IllegalArgumentException when getStatusText() is called with invalid http status code - Assertions.assertThrows(IllegalArgumentException.class, () -> response.getStatusText()); + assertThatThrownBy(() -> response.getStatusText()).isInstanceOf(IllegalArgumentException.class); } @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()); + assertThatCode(() -> body.read()).doesNotThrowAnyException(); } @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()); + assertThatCode(() -> response.close()).doesNotThrowAnyException(); } } diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPluginTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPluginTest.java index 0c28d5f72..c86b8eb50 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPluginTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPluginTest.java @@ -53,7 +53,7 @@ import org.springframework.http.HttpMethod; import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST; import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java index d914772f9..c5d94ea08 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java @@ -32,7 +32,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; @@ -302,21 +301,21 @@ 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() { diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplierTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplierTest.java index f8baa12be..751f14280 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplierTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplierTest.java @@ -71,8 +71,8 @@ import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; import org.springframework.http.HttpHeaders; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java index ec6f1b030..574979bb4 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java @@ -37,7 +37,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java index d48f5ece1..5f741d775 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java @@ -43,7 +43,7 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.mock.http.client.MockClientHttpResponse; import org.springframework.test.context.junit.jupiter.SpringExtension; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index bf58af383..f9a8f7f40 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.1 + 4.2.3 4.0.0 @@ -80,7 +80,7 @@ 2.8.13 - 1.3.0 + 1.6.0 0.8.0 diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest.java index 0e4e3b8fb..0e4d0529c 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterBeanPostProcessorTest.java @@ -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); } } diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterTest.java index e68db2ceb..652a61d7c 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/PolarisReactiveLoadBalancerClientFilterTest.java @@ -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); } } diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextGatewayPropertiesManagerTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextGatewayPropertiesManagerTest.java index 4408cd093..0f7e46ec5 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextGatewayPropertiesManagerTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextGatewayPropertiesManagerTest.java @@ -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()).hasSize(1); } } diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextRoutePredicateFactoryTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextRoutePredicateFactoryTest.java index f60cf0198..0dce2a443 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextRoutePredicateFactoryTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/context/ContextRoutePredicateFactoryTest.java @@ -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); }); } diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/beanprocessor/BlockingLoadBalancerClientBeanPostProcessorTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/beanprocessor/BlockingLoadBalancerClientBeanPostProcessorTest.java index 0d50adcfd..6d632298b 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/beanprocessor/BlockingLoadBalancerClientBeanPostProcessorTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/beanprocessor/BlockingLoadBalancerClientBeanPostProcessorTest.java @@ -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); } } diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/scg/EnhancedGatewayGlobalFilterTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/scg/EnhancedGatewayGlobalFilterTest.java index a776b0a4c..ed8be9417 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/scg/EnhancedGatewayGlobalFilterTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/scg/EnhancedGatewayGlobalFilterTest.java @@ -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,7 @@ public class EnhancedGatewayGlobalFilterTest { EnhancedGatewayGlobalFilter filter = new EnhancedGatewayGlobalFilter(pluginRunner); // Act & Assert - Assertions.assertThrows(CallAbortedException.class, () -> { - filter.filter(exchange, chain); - }); + assertThatThrownBy(() -> filter.filter(exchange, chain)).isInstanceOf(CallAbortedException.class); } @Test diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/webclient/EnhancedWebClientExchangeFilterFunctionTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/webclient/EnhancedWebClientExchangeFilterFunctionTest.java index 13d2724c0..4f3eae8a6 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/webclient/EnhancedWebClientExchangeFilterFunctionTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/webclient/EnhancedWebClientExchangeFilterFunctionTest.java @@ -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; }) diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/DefaultEnhancedPluginRunnerTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/DefaultEnhancedPluginRunnerTest.java index 7b5813ee6..85611b22b 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/DefaultEnhancedPluginRunnerTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/DefaultEnhancedPluginRunnerTest.java @@ -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 diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 452aaa5f7..5993108df 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -4,5 +4,4 @@ "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> - \ No newline at end of file