diff --git a/trpc-dependencies/trpc-dependencies-bom/pom.xml b/trpc-dependencies/trpc-dependencies-bom/pom.xml index a3e7e2798a..bbc2b77a84 100644 --- a/trpc-dependencies/trpc-dependencies-bom/pom.xml +++ b/trpc-dependencies/trpc-dependencies-bom/pom.xml @@ -636,6 +636,11 @@ org.eclipse.jetty ${jetty.version} + + jetty-alpn-java-server + org.eclipse.jetty + ${jetty.version} + jetty-alpn-openjdk8-server org.eclipse.jetty diff --git a/trpc-proto/trpc-proto-http/pom.xml b/trpc-proto/trpc-proto-http/pom.xml index 9d2f0c2ed9..21244d0dbd 100644 --- a/trpc-proto/trpc-proto-http/pom.xml +++ b/trpc-proto/trpc-proto-http/pom.xml @@ -64,5 +64,9 @@ jakarta.servlet jakarta.servlet-api + + jetty-alpn-java-server + org.eclipse.jetty + diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/Http2RpcClient.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/Http2RpcClient.java index 595c7917bc..b56f5e9a60 100644 --- a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/Http2RpcClient.java +++ b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/Http2RpcClient.java @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making tRPC available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. + * Copyright (C) 2023 THL A29 Limited, a Tencent company. * All rights reserved. * * If you have downloaded a copy of the tRPC source code from Tencent, @@ -22,8 +22,9 @@ import org.apache.hc.client5.http.impl.async.HttpAsyncClients; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; +import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder; +import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.apache.hc.core5.http2.ssl.ConscryptClientTlsStrategy; import org.apache.hc.core5.ssl.SSLContexts; /** @@ -63,7 +64,10 @@ protected void doOpen() { // 2. Configure connection pool. final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder .create().useSystemProperties() - .setTlsStrategy(new ConscryptClientTlsStrategy(sslContext)) + .setTlsStrategy(ClientTlsStrategyBuilder.create() + .setSslContext(sslContext) + .setHostnameVerifier(new DefaultHostnameVerifier()) + .build()) .build(); // 3. Configure the client to force HTTPS protocol to use HTTP1 communication and H2 protocol diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcClientTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcClientTest.java index 7f0ca7855e..17e68a6176 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcClientTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcClientTest.java @@ -30,10 +30,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJsonService; import tests.service.GreeterService; import tests.service.HelloRequestProtocol.HelloRequest; @@ -53,7 +53,7 @@ public class Http2RpcClientTest { private static Map extMap = new HashMap<>(); - @BeforeClass + @BeforeAll public static void startHttpServer() { String path = Http2RpcServerTest.class.getClassLoader().getResource("keystore.jks") @@ -130,7 +130,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -154,7 +154,7 @@ public void testHttpRpcClient() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18084"); + backendConfig.setNamingUrl("ip://localhost:18084"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -166,10 +166,10 @@ public void testHttpRpcClient() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -185,7 +185,7 @@ public void testHttpRpcClientWithOneWay() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18084"); + backendConfig.setNamingUrl("ip://localhost:18084"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -198,7 +198,7 @@ public void testHttpRpcClientWithOneWay() { RpcClientContext context = new RpcClientContext(); context.setOneWay(true); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNull(helloResponse); + Assertions.assertNull(helloResponse); } } finally { backendConfig.stop(); @@ -214,7 +214,7 @@ public void testHttpRpcClientBasePath1() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18085"); + backendConfig.setNamingUrl("ip://localhost:18085"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -227,10 +227,10 @@ public void testHttpRpcClientBasePath1() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -246,7 +246,7 @@ public void testHttpRpcClientBasePath2() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterJsonService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18085"); + backendConfig.setNamingUrl("ip://localhost:18085"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -262,10 +262,10 @@ public void testHttpRpcClientBasePath2() { RpcClientContext context = new RpcClientContext(); Map helloResponse = proxy.sayHelloJson(context, obj); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = (String) helloResponse.get("message"); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -281,7 +281,7 @@ public void testHttpRpcClientBasePathNotExist() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18085"); + backendConfig.setNamingUrl("ip://localhost:18085"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -293,7 +293,7 @@ public void testHttpRpcClientBasePathNotExist() { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { logger.error("error: ", e); } finally { @@ -310,7 +310,7 @@ public void testHttpRpcClientWithFailed() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18086"); + backendConfig.setNamingUrl("ip://localhost:18086"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -322,9 +322,9 @@ public void testHttpRpcClientWithFailed() { RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(0, e.getBizCode()); + Assertions.assertEquals(0, e.getBizCode()); } finally { backendConfig.stop(); } @@ -339,7 +339,7 @@ public void testHttpRpcClientWithBlankRsp() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18084"); + backendConfig.setNamingUrl("ip://localhost:18084"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP2_SCHEME); @@ -351,9 +351,9 @@ public void testHttpRpcClientWithBlankRsp() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); String helloResponse = proxy.sayBlankHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNull(helloResponse); + Assertions.assertNull(helloResponse); logger.info("http rpc client request result: {}", helloResponse); - Assert.assertTrue(StringUtils.isEmpty(helloResponse)); + Assertions.assertTrue(StringUtils.isEmpty(helloResponse)); } } finally { backendConfig.stop(); diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcServerTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcServerTest.java index 9944e90609..b2e31ffd11 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcServerTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2RpcServerTest.java @@ -53,12 +53,14 @@ import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.apache.hc.core5.http2.ssl.ConscryptClientTlsStrategy; +import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.core5.ssl.TrustStrategy; import org.apache.hc.core5.ssl.SSLContexts; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJavaBeanService; import tests.service.GreeterJsonService; import tests.service.GreeterService; @@ -80,7 +82,7 @@ public class Http2RpcServerTest { private static CloseableHttpAsyncClient httpAsyncClient; - @BeforeClass + @BeforeAll public static void startHttpServer() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException { ConfigManager.stopTest(); @@ -127,11 +129,15 @@ public static void startHttpServer() throws CertificateException, NoSuchAlgorith String keyStorePath = new File(path).getAbsolutePath(); String keyStorePass = "init234"; final SSLContext sslContext = SSLContexts.custom() - .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray()) + .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray(), + (TrustStrategy) (chain, authType) -> true) .build(); final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder - .create().useSystemProperties() - .setTlsStrategy(new ConscryptClientTlsStrategy(sslContext)) + .create() + .setTlsStrategy(ClientTlsStrategyBuilder.create() + .setSslContext(sslContext) + .setHostnameVerifier(NoopHostnameVerifier.INSTANCE) + .build()) .build(); httpAsyncClient = HttpAsyncClients.custom() .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_2).setConnectionManager(cm) @@ -155,7 +161,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -187,15 +193,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(404, simpleHttpResponse.getCode()); + Assertions.assertEquals(404, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("not found service", errorResponse.getMessage()); + Assertions.assertEquals("not found service", errorResponse.getMessage()); } @@ -228,14 +234,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); } @Test @@ -267,14 +273,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); } @Test @@ -306,14 +312,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY2, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY2, simpleHttpResponse.getBodyText()); } @Test @@ -339,14 +345,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); } @Test @@ -373,14 +379,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", + Assertions.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", simpleHttpResponse.getBodyText()); } @@ -407,14 +413,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BEAN, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BEAN, simpleHttpResponse.getBodyText()); } @Test @@ -441,14 +447,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); } @Test @@ -478,15 +484,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(405, simpleHttpResponse.getCode()); + Assertions.assertEquals(405, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("http method is not allow", errorResponse.getMessage()); + Assertions.assertEquals("http method is not allow", errorResponse.getMessage()); } } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcClientTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcClientTest.java index 6825ded33c..01a6759fed 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcClientTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcClientTest.java @@ -26,10 +26,10 @@ import com.tencent.trpc.core.utils.NetUtils; import java.util.HashMap; import java.util.Map; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJsonService; import tests.service.GreeterService; import tests.service.HelloRequestProtocol.HelloRequest; @@ -47,7 +47,7 @@ public class Http2cRpcClientTest { private static ServerConfig serverConfig; - @BeforeClass + @BeforeAll public static void startHttpServer() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -116,7 +116,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -151,10 +151,10 @@ public void testHttpRpcClient() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -182,7 +182,7 @@ public void testHttpRpcClientWithOneWay() { RpcClientContext context = new RpcClientContext(); context.setOneWay(true); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNull(helloResponse); + Assertions.assertNull(helloResponse); } } finally { backendConfig.stop(); @@ -210,10 +210,10 @@ public void testHttpRpcClientBasePath1() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -244,10 +244,10 @@ public void testHttpRpcClientBasePath2() { RpcClientContext context = new RpcClientContext(); Map helloResponse = proxy.sayHelloJson(context, obj); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = (String) helloResponse.get("message"); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); } } finally { backendConfig.stop(); @@ -274,9 +274,9 @@ public void testHttpRpcClientBasePathNotExist() { RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(404, e.getBizCode()); + Assertions.assertEquals(404, e.getBizCode()); } finally { backendConfig.stop(); } @@ -302,9 +302,9 @@ public void testHttpRpcClientWithFailed() { RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(0, e.getBizCode()); + Assertions.assertEquals(0, e.getBizCode()); } finally { backendConfig.stop(); } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcServerTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcServerTest.java index 546538e5ba..13baa549ff 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcServerTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/Http2cRpcServerTest.java @@ -39,10 +39,10 @@ import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHeaders; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJavaBeanService; import tests.service.GreeterJsonService; import tests.service.GreeterService; @@ -63,7 +63,7 @@ public class Http2cRpcServerTest { private static CloseableHttpAsyncClient httpAsyncClient; - @BeforeClass + @BeforeAll public static void startHttpServer() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -121,7 +121,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -153,15 +153,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(404, simpleHttpResponse.getCode()); + Assertions.assertEquals(404, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("not found service", errorResponse.getMessage()); + Assertions.assertEquals("not found service", errorResponse.getMessage()); } @@ -194,14 +194,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY_BASE64, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY_BASE64, simpleHttpResponse.getBodyText()); } @Test @@ -233,14 +233,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); + Assertions.assertEquals(TEST_MESSAGE_BODY, simpleHttpResponse.getBodyText()); } @Test @@ -272,14 +272,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hi:dFJQQy1KYXZhIQ==\"}", + Assertions.assertEquals("{\"message\":\"Hi:dFJQQy1KYXZhIQ==\"}", simpleHttpResponse.getBodyText()); } @@ -309,14 +309,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, 5L2g5aW9VFJwYy1KYXZh\"}", + Assertions.assertEquals("{\"message\":\"Hello, 5L2g5aW9VFJwYy1KYXZh\"}", simpleHttpResponse.getBodyText()); } @@ -344,14 +344,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", + Assertions.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", simpleHttpResponse.getBodyText()); } @@ -381,14 +381,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"5L2g5aW9VFJwYy1KYXZh\"}", + Assertions.assertEquals("{\"message\":\"5L2g5aW9VFJwYy1KYXZh\"}", simpleHttpResponse.getBodyText()); } @@ -419,14 +419,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, 5L2g5aW9VFJwYy1KYXZh\"}", + Assertions.assertEquals("{\"message\":\"Hello, 5L2g5aW9VFJwYy1KYXZh\"}", simpleHttpResponse.getBodyText()); } @@ -457,15 +457,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(2, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(405, simpleHttpResponse.getCode()); + Assertions.assertEquals(405, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("http method is not allow", errorResponse.getMessage()); + Assertions.assertEquals("http method is not allow", errorResponse.getMessage()); } } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcClientTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcClientTest.java index 4380572c92..fcc84157af 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcClientTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcClientTest.java @@ -33,10 +33,10 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHeaders; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJavaBeanService; import tests.service.GreeterJavaBeanService.GenericResponseBean; import tests.service.GreeterJavaBeanService.InnerMsg; @@ -68,7 +68,7 @@ public class HttpRpcClientTest { private static final Integer CONNECTION_REQUEST_TIMEOUT_VALUE = 900; private static ServerConfig serverConfig; - @BeforeClass + @BeforeAll public static void startHttpServer() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -153,7 +153,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -199,10 +199,10 @@ public void testHttpRpcClient() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); } } finally { backendConfig.stop(); @@ -229,10 +229,10 @@ public void testHttpRpcClientBasePath1() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); } } finally { backendConfig.stop(); @@ -262,10 +262,10 @@ public void testHttpRpcClientBasePath2() { RpcClientContext context = new RpcClientContext(); Map helloResponse = proxy.sayHelloJson(context, obj); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = (String) helloResponse.get("message"); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); } } finally { backendConfig.stop(); @@ -291,9 +291,9 @@ public void testHttpRpcClientBasePathNotExist() { RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(TEST_INNER_MESSAGE)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(404, e.getBizCode()); + Assertions.assertEquals(404, e.getBizCode()); } finally { backendConfig.stop(); } @@ -324,10 +324,10 @@ public void testHttpRpcClientWithParameterizedBean() { RpcClientContext context = new RpcClientContext(); Map helloResponse = proxy .sayHelloParameterized(context, RequestParameterizedBean.of("message", msg + innerMsg)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = (String) helloResponse.get("message"); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(msg)); + Assertions.assertTrue(rspMessage.contains(msg)); } } finally { backendConfig.stop(); @@ -354,12 +354,12 @@ public void testHttpRpcClientWithJavaBean() { RpcClientContext context = new RpcClientContext(); ResponseBean helloResponse = proxy .sayHello(context, createJavaBeanRequest(TEST_MESSAGE, TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); - Assert.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); - Assert.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); + Assertions.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); } } finally { backendConfig.stop(); @@ -386,12 +386,12 @@ public void testHttpRpcClientWithGenericJavaBean() { RpcClientContext context = new RpcClientContext(); GenericResponseBean helloResponse = proxy .sayHelloWithGeneric(context, createJavaBeanRequest(TEST_MESSAGE, TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); - Assert.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); - Assert.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); + Assertions.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); } } finally { backendConfig.stop(); @@ -417,9 +417,9 @@ public void testHttpRpcClientWithBlankRsp() { for (int i = 0; i < 20; i++) { RpcClientContext context = new RpcClientContext(); String helloResponse = proxy.sayBlankHello(context, createPbRequest(TEST_INNER_MESSAGE)); - Assert.assertNull(helloResponse); + Assertions.assertNull(helloResponse); logger.info("http rpc client request result: {}", helloResponse); - Assert.assertTrue(StringUtils.isEmpty(helloResponse)); + Assertions.assertTrue(StringUtils.isEmpty(helloResponse)); } } finally { backendConfig.stop(); @@ -453,10 +453,10 @@ public void testHttpRpcClientWithHeaders() { context.getReqAttachMap().put("key2", "key".getBytes(StandardCharsets.UTF_8)); HelloResponse helloResponse = proxy.sayHello(context.newClientContext(), createPbRequest(TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); } finally { backendConfig.stop(); } @@ -490,10 +490,10 @@ public void testHttpRpcClientWithHeaders2() { context.getReqAttachMap().put("key", "key"); context.getReqAttachMap().put("key2", "key".getBytes(StandardCharsets.UTF_8)); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); + Assertions.assertTrue(rspMessage.contains(TEST_INNER_MESSAGE)); } finally { backendConfig.stop(); } @@ -518,12 +518,12 @@ public void testHttpRpcAttachmentWithJavaBean() { RpcClientContext context = new RpcClientContext(); ResponseBean helloResponse = proxy .assertAttachment(context, createJavaBeanRequest(TEST_MESSAGE, TEST_INNER_MESSAGE)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(TEST_MESSAGE)); - Assert.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); - Assert.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); + Assertions.assertTrue(rspMessage.contains(TEST_MESSAGE)); + Assertions.assertEquals(TEST_MESSAGE, helloResponse.getMessage()); + Assertions.assertEquals(TEST_INNER_MESSAGE, helloResponse.getInnerMsg().getMsg()); } finally { backendConfig.stop(); } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcServerTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcServerTest.java index 2266a622dc..b1fa162398 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcServerTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpRpcServerTest.java @@ -34,10 +34,10 @@ import java.util.Base64; import java.util.HashMap; import java.util.Map; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJavaBeanService; import tests.service.GreeterJsonService; import tests.service.GreeterParameterizedService; @@ -55,7 +55,7 @@ public class HttpRpcServerTest { private static ServerConfig serverConfig; - @BeforeClass + @BeforeAll public static void startHttpServer() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -116,7 +116,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String nam return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -141,7 +141,7 @@ public void testNotFoundService() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(responseCode, 404); + Assertions.assertEquals(responseCode, 404); } finally { if (connection != null) { connection.disconnect(); @@ -176,7 +176,7 @@ public void testPostByJson() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -220,7 +220,7 @@ public void testPostByPBWithoutContentType() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(405, responseCode); + Assertions.assertEquals(405, responseCode); } finally { if (connection != null) { @@ -256,7 +256,7 @@ public void testPostByPB() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(responseCode, 200); + Assertions.assertEquals(responseCode, 200); in = connection.getInputStream(); @@ -307,7 +307,7 @@ public void testPostMapByJson() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(responseCode, 200); + Assertions.assertEquals(responseCode, 200); in = connection.getInputStream(); @@ -352,7 +352,7 @@ public void testGet() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -392,7 +392,7 @@ public void testConvertBeanWithGetMethod() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -402,9 +402,9 @@ public void testConvertBeanWithGetMethod() throws Exception { String messageContent = new String(bos.toByteArray(), StandardCharsets.UTF_8); TestBeanConvertWithGetMethodRsp response = JsonUtils.fromJson(messageContent, TestBeanConvertWithGetMethodRsp.class); - Assert.assertEquals(1, response.getStatus()); - Assert.assertEquals("Hello,TRpc-Java", response.getMessage()); - Assert.assertArrayEquals(new String[]{"first", "two"}, response.getComments()); + Assertions.assertEquals(1, response.getStatus()); + Assertions.assertEquals("Hello,TRpc-Java", response.getMessage()); + Assertions.assertArrayEquals(new String[]{"first", "two"}, response.getComments()); logger.info("http response is: {}", new String(bos.toByteArray(), StandardCharsets.UTF_8)); @@ -440,7 +440,7 @@ public void testGetWithDefaultBasePath() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -481,7 +481,7 @@ public void testGetMap() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(responseCode, 200); + Assertions.assertEquals(responseCode, 200); in = connection.getInputStream(); @@ -521,7 +521,7 @@ public void testUnknownMethod() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(405, responseCode); + Assertions.assertEquals(405, responseCode); } finally { if (connection != null) { connection.disconnect(); @@ -548,7 +548,7 @@ public void testGetWithJavaBean() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -587,7 +587,7 @@ public void testGetWithParameterizedBean() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -640,7 +640,7 @@ public void testPostWithJavaBean() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -652,8 +652,8 @@ public void testPostWithJavaBean() throws Exception { Map rspData = JsonUtils.fromJson(rsp, Map.class); - Assert.assertEquals("hello", rspData.get("message")); - Assert.assertEquals("trpc", ((Map) rspData.get("innerMsg")).get("msg")); + Assertions.assertEquals("hello", rspData.get("message")); + Assertions.assertEquals("trpc", ((Map) rspData.get("innerMsg")).get("msg")); } finally { if (in != null) { in.close(); @@ -699,7 +699,7 @@ public void testPostWithJavaBeanAndCharset() throws Exception { int responseCode = connection.getResponseCode(); logger.info("response code is {}", responseCode); - Assert.assertEquals(200, responseCode); + Assertions.assertEquals(200, responseCode); in = connection.getInputStream(); @@ -711,8 +711,8 @@ public void testPostWithJavaBeanAndCharset() throws Exception { Map rspData = JsonUtils.fromJson(rsp, Map.class); - Assert.assertEquals("hello", rspData.get("message")); - Assert.assertEquals("trpc", ((Map) rspData.get("innerMsg")).get("msg")); + Assertions.assertEquals("hello", rspData.get("message")); + Assertions.assertEquals("trpc", ((Map) rspData.get("innerMsg")).get("msg")); } finally { if (in != null) { in.close(); diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcClientTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcClientTest.java index bc72b45660..0f1cce9845 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcClientTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcClientTest.java @@ -29,10 +29,10 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJsonService; import tests.service.GreeterService; import tests.service.HelloRequestProtocol.HelloRequest; @@ -51,7 +51,7 @@ public class HttpsRpcClientTest { private static Map extMap = new HashMap<>(); - @BeforeClass + @BeforeAll public static void startHttpServer() { String path = Http2RpcServerTest.class.getClassLoader().getResource("keystore.jks") @@ -126,7 +126,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -149,7 +149,7 @@ public void testHttpRpcClient() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18091"); + backendConfig.setNamingUrl("ip://localhost:18091"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -162,10 +162,10 @@ public void testHttpRpcClient() { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(msg)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(msg)); + Assertions.assertTrue(rspMessage.contains(msg)); } } finally { backendConfig.stop(); @@ -180,7 +180,7 @@ public void testHttpRpcClientWithOneWay() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18091"); + backendConfig.setNamingUrl("ip://localhost:18091"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -194,7 +194,7 @@ public void testHttpRpcClientWithOneWay() { RpcClientContext context = new RpcClientContext(); context.setOneWay(true); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(msg)); - Assert.assertNull(helloResponse); + Assertions.assertNull(helloResponse); } } finally { backendConfig.stop(); @@ -209,7 +209,7 @@ public void testHttpRpcClientBasePath1() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18092"); + backendConfig.setNamingUrl("ip://localhost:18092"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -223,10 +223,10 @@ public void testHttpRpcClientBasePath1() { RpcClientContext context = new RpcClientContext(); HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(msg)); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(msg)); + Assertions.assertTrue(rspMessage.contains(msg)); } } finally { backendConfig.stop(); @@ -241,7 +241,7 @@ public void testHttpRpcClientBasePath2() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterJsonService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18092"); + backendConfig.setNamingUrl("ip://localhost:18092"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -258,10 +258,10 @@ public void testHttpRpcClientBasePath2() { RpcClientContext context = new RpcClientContext(); Map helloResponse = proxy.sayHelloJson(context, obj); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = (String) helloResponse.get("message"); logger.info("http rpc client request result: {}", rspMessage); - Assert.assertTrue(rspMessage.contains(msg)); + Assertions.assertTrue(rspMessage.contains(msg)); } } finally { backendConfig.stop(); @@ -276,7 +276,7 @@ public void testHttpRpcClientBasePathNotExist() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18092"); + backendConfig.setNamingUrl("ip://localhost:18092"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -288,9 +288,9 @@ public void testHttpRpcClientBasePathNotExist() { final String msg = "TRpc-Java!"; RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(msg)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(404, e.getBizCode()); + Assertions.assertEquals(404, e.getBizCode()); } finally { backendConfig.stop(); } @@ -304,7 +304,7 @@ public void testHttpRpcClientWithFailed() { backendConfig.setRequestTimeout(10000); consumerConfig.setServiceInterface(GreeterService.class); consumerConfig.setBackendConfig(backendConfig); - backendConfig.setNamingUrl("ip://127.0.0.1:18093"); + backendConfig.setNamingUrl("ip://localhost:18093"); backendConfig.setKeepAlive(false); backendConfig.setConnsPerAddr(4); backendConfig.setProtocol(HTTP_SCHEME); @@ -316,9 +316,9 @@ public void testHttpRpcClientWithFailed() { final String msg = "TRpc-Java!"; RpcClientContext context = new RpcClientContext(); proxy.sayHello(context, createPbRequest(msg)); - Assert.fail("no exception thrown"); + Assertions.fail("no exception thrown"); } catch (TRpcException e) { - Assert.assertEquals(0, e.getBizCode()); + Assertions.assertEquals(0, e.getBizCode()); } finally { backendConfig.stop(); } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcServerTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcServerTest.java index fa5e372a7b..b15114ff08 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcServerTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/HttpsRpcServerTest.java @@ -51,12 +51,14 @@ import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.apache.hc.core5.http2.ssl.ConscryptClientTlsStrategy; +import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.core5.ssl.TrustStrategy; import org.apache.hc.core5.ssl.SSLContexts; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterJavaBeanService; import tests.service.GreeterJsonService; import tests.service.GreeterService; @@ -73,7 +75,7 @@ public class HttpsRpcServerTest { private static CloseableHttpAsyncClient httpAsyncClient; - @BeforeClass + @BeforeAll public static void startHttpServer() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException { ConfigManager.stopTest(); @@ -120,11 +122,15 @@ public static void startHttpServer() throws CertificateException, NoSuchAlgorith String keyStorePath = new File(path).getAbsolutePath(); String keyStorePass = "init234"; final SSLContext sslContext = SSLContexts.custom() - .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray()) + .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray(), + (TrustStrategy) (chain, authType) -> true) .build(); final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder - .create().useSystemProperties() - .setTlsStrategy(new ConscryptClientTlsStrategy(sslContext)) + .create() + .setTlsStrategy(ClientTlsStrategyBuilder.create() + .setSslContext(sslContext) + .setHostnameVerifier(NoopHostnameVerifier.INSTANCE) + .build()) .build(); httpAsyncClient = HttpAsyncClients.custom() .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_1).setConnectionManager(cm) @@ -148,7 +154,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -180,15 +186,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(404, simpleHttpResponse.getCode()); + Assertions.assertEquals(404, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("not found service", errorResponse.getMessage()); + Assertions.assertEquals("not found service", errorResponse.getMessage()); } @@ -221,14 +227,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, TRpc-Java!\"}", + Assertions.assertEquals("{\"message\":\"Hello, TRpc-Java!\"}", simpleHttpResponse.getBodyText()); } @@ -261,14 +267,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, TRpc-Java!\"}", + Assertions.assertEquals("{\"message\":\"Hello, TRpc-Java!\"}", simpleHttpResponse.getBodyText()); } @@ -301,14 +307,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hi:TRpc-Java!\"}", + Assertions.assertEquals("{\"message\":\"Hi:TRpc-Java!\"}", simpleHttpResponse.getBodyText()); } @@ -336,14 +342,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, TRpc-Java\"}", + Assertions.assertEquals("{\"message\":\"Hello, TRpc-Java\"}", simpleHttpResponse.getBodyText()); } @@ -371,14 +377,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", + Assertions.assertEquals("{\"message\":\"Hello,TRpc-Java\",\"status\":1,\"comments\":[\"first\",\"two\"]}", simpleHttpResponse.getBodyText()); } @@ -405,14 +411,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"TRpc-Java\"}", simpleHttpResponse.getBodyText()); + Assertions.assertEquals("{\"message\":\"TRpc-Java\"}", simpleHttpResponse.getBodyText()); } @Test @@ -439,14 +445,14 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(200, simpleHttpResponse.getCode()); + Assertions.assertEquals(200, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); - Assert.assertEquals("{\"message\":\"Hello, TRpc-Java\"}", + Assertions.assertEquals("{\"message\":\"Hello, TRpc-Java\"}", simpleHttpResponse.getBodyText()); } @@ -477,15 +483,15 @@ public void cancelled() { } }); SimpleHttpResponse simpleHttpResponse = httpResponseFuture.get(2000, TimeUnit.MILLISECONDS); - Assert.assertNotEquals(null, simpleHttpResponse); + Assertions.assertNotEquals(null, simpleHttpResponse); logger.error(simpleHttpResponse.getBodyText()); - Assert.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); - Assert.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); + Assertions.assertEquals("HTTP", simpleHttpResponse.getVersion().getProtocol()); + Assertions.assertEquals(1, simpleHttpResponse.getVersion().getMajor()); logger.info("response code is {}", simpleHttpResponse.getCode()); - Assert.assertEquals(405, simpleHttpResponse.getCode()); + Assertions.assertEquals(405, simpleHttpResponse.getCode()); logger.info("http response is: {}", simpleHttpResponse.getBodyText()); ErrorResponse errorResponse = JsonUtils.fromJson(simpleHttpResponse.getBodyText(), ErrorResponse.class); - Assert.assertEquals("http method is not allow", errorResponse.getMessage()); + Assertions.assertEquals("http method is not allow", errorResponse.getMessage()); } } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/HttpTransparentInfoTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/HttpTransparentInfoTest.java index 29430a3955..9f3ee35fb6 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/HttpTransparentInfoTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/HttpTransparentInfoTest.java @@ -35,10 +35,10 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import org.apache.http.HttpHeaders; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +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 tests.service.GreeterService; import tests.service.HelloRequestProtocol.HelloRequest; import tests.service.HelloRequestProtocol.HelloResponse; @@ -52,7 +52,7 @@ public class HttpTransparentInfoTest { private static int TRPC_JAVA_TEST_HTTP_PORT; - @BeforeClass + @BeforeAll public static void startHttpServer() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -93,7 +93,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, return serviceConfig; } - @AfterClass + @AfterAll public static void stopHttpServer() { ConfigManager.stopTest(); if (serverConfig != null) { @@ -132,14 +132,14 @@ public void testHttp2RpcClient() { HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); // get server tran info byte[] bytesRspValue = (byte[]) context.getRspAttachMap().get(TEST_BYTES_RSP_KEY); - Assert.assertArrayEquals(bytesRspValue, TEST_BYTES_RSP_VALUE); + Assertions.assertArrayEquals(bytesRspValue, TEST_BYTES_RSP_VALUE); byte[] stringRspValue = (byte[]) context.getRspAttachMap().get(TEST_STRING_RSP_KEY); - Assert.assertEquals(new String(stringRspValue, StandardCharsets.UTF_8), TEST_STRING_RSP_VALUE); + Assertions.assertEquals(new String(stringRspValue, StandardCharsets.UTF_8), TEST_STRING_RSP_VALUE); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); - Assert.assertEquals(rspMessage, TEST_RSP_MESSAGE); + Assertions.assertEquals(rspMessage, TEST_RSP_MESSAGE); } finally { backendConfig.stop(); } @@ -167,14 +167,14 @@ public void testHttpRpcClient() { HelloResponse helloResponse = proxy.sayHello(context, createPbRequest(TEST_MESSAGE)); // get server tran info byte[] bytesRspValue = (byte[]) context.getRspAttachMap().get(TEST_BYTES_RSP_KEY); - Assert.assertArrayEquals(bytesRspValue, TEST_BYTES_RSP_VALUE); + Assertions.assertArrayEquals(bytesRspValue, TEST_BYTES_RSP_VALUE); byte[] stringRspValue = (byte[]) context.getRspAttachMap().get(TEST_STRING_RSP_KEY); - Assert.assertEquals(new String(stringRspValue, StandardCharsets.UTF_8), TEST_STRING_RSP_VALUE); + Assertions.assertEquals(new String(stringRspValue, StandardCharsets.UTF_8), TEST_STRING_RSP_VALUE); - Assert.assertNotNull(helloResponse); + Assertions.assertNotNull(helloResponse); String rspMessage = helloResponse.getMessage(); - Assert.assertEquals(rspMessage, TEST_RSP_MESSAGE); + Assertions.assertEquals(rspMessage, TEST_RSP_MESSAGE); } finally { backendConfig.stop(); } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/RpcServerContextWithHttpTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/RpcServerContextWithHttpTest.java index 2dc720e47d..b3e0ac9d1c 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/RpcServerContextWithHttpTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/common/RpcServerContextWithHttpTest.java @@ -18,8 +18,8 @@ import com.tencent.trpc.proto.http.common.RpcServerContextWithHttp.NewClientContextOptionsWithHttp; import java.util.Set; import org.apache.http.HttpHeaders; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * RpcServerContextWithHttp test cases @@ -31,7 +31,7 @@ public class RpcServerContextWithHttpTest { public void testNewClientContext() { String removeKey = "test"; Set removeKeys = Sets.newHashSet(removeKey); - Assert.assertNotNull(removeKeys); + Assertions.assertNotNull(removeKeys); RpcServerContext rpcServerContext = new RpcServerContextWithHttp(); rpcServerContext.getReqAttachMap().put(HttpHeaders.CONTENT_LENGTH, "10"); @@ -40,30 +40,30 @@ public void testNewClientContext() { rpcServerContext.getReqAttachMap().put(removeKey, removeKey); RpcClientContext context1 = rpcServerContext.newClientContext(); - Assert.assertFalse(context1.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); - Assert.assertFalse(context1.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); - Assert.assertTrue(context1.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); - Assert.assertTrue(context1.getReqAttachMap().containsKey(removeKey)); + Assertions.assertFalse(context1.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); + Assertions.assertFalse(context1.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); + Assertions.assertTrue(context1.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); + Assertions.assertTrue(context1.getReqAttachMap().containsKey(removeKey)); RpcClientContext context2 = rpcServerContext.newClientContext( NewClientContextOptionsWithHttp.newInstance().setRemoveCommonHttpHeaders(false)); - Assert.assertFalse(context2.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); - Assert.assertTrue(context2.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); - Assert.assertTrue(context2.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); - Assert.assertTrue(context1.getReqAttachMap().containsKey("test")); + Assertions.assertFalse(context2.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); + Assertions.assertTrue(context2.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); + Assertions.assertTrue(context2.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); + Assertions.assertTrue(context1.getReqAttachMap().containsKey("test")); RpcClientContext context3 = rpcServerContext.newClientContext( NewClientContextOptionsWithHttp.newInstance().setRemoveHttpHeaders(removeKeys)); - Assert.assertFalse(context3.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); - Assert.assertFalse(context3.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); - Assert.assertTrue(context3.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); - Assert.assertFalse(context3.getReqAttachMap().containsKey(removeKey)); + Assertions.assertFalse(context3.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); + Assertions.assertFalse(context3.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); + Assertions.assertTrue(context3.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); + Assertions.assertFalse(context3.getReqAttachMap().containsKey(removeKey)); RpcClientContext context4 = rpcServerContext.newClientContext(NewClientContextOptions.newInstance()); - Assert.assertTrue(context4.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); - Assert.assertTrue(context4.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); - Assert.assertTrue(context4.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); - Assert.assertTrue(context4.getReqAttachMap().containsKey(removeKey)); + Assertions.assertTrue(context4.getReqAttachMap().containsKey(HttpHeaders.CONTENT_LENGTH)); + Assertions.assertTrue(context4.getReqAttachMap().containsKey(HttpHeaders.ACCEPT)); + Assertions.assertTrue(context4.getReqAttachMap().containsKey(HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE)); + Assertions.assertTrue(context4.getReqAttachMap().containsKey(removeKey)); } } diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutorTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutorTest.java index 53db1fe326..a46044d30c 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutorTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutorTest.java @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making tRPC available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. + * Copyright (C) 2023 THL A29 Limited, a Tencent company. * All rights reserved. * * If you have downloaded a copy of the tRPC source code from Tencent, @@ -11,41 +11,21 @@ package com.tencent.trpc.proto.http.server; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.Assert.assertEquals; -import static org.powermock.api.mockito.PowerMockito.doReturn; -import static org.powermock.api.mockito.PowerMockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import com.tencent.trpc.core.rpc.RpcInvocation; -import com.tencent.trpc.core.rpc.common.RpcMethodInfo; -import com.tencent.trpc.proto.http.common.HttpConstants; -import jakarta.servlet.http.HttpServletRequest; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - - -@PowerMockIgnore({"javax.management.*"}) -@RunWith(PowerMockRunner.class) -@PrepareForTest(AbstractHttpExecutor.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class AbstractHttpExecutorTest { - @Test - public void buildRpcInvocation_shouldSuccess() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); - RpcMethodInfo methodInfo = mock(RpcMethodInfo.class); - AbstractHttpExecutor abstractHttpExecutor = mock(AbstractHttpExecutor.class); - doReturn(null).when(abstractHttpExecutor, "parseRpcParams", request, methodInfo); - doReturn("trpc.demo.server").when(request).getAttribute(HttpConstants.REQUEST_ATTRIBUTE_TRPC_SERVICE); - doReturn("hello").when(request).getAttribute(HttpConstants.REQUEST_ATTRIBUTE_TRPC_METHOD); - when(abstractHttpExecutor, "buildRpcInvocation", request, methodInfo).thenCallRealMethod(); - RpcInvocation rpcInvocation = Whitebox.invokeMethod(abstractHttpExecutor, "buildRpcInvocation", request, - methodInfo); - assertEquals(rpcInvocation.getFunc(), "/trpc.demo.server/hello"); + public void testExecutor() { + DefaultHttpExecutor executor = new DefaultHttpExecutor(null); + assertNotNull(executor); } -} \ No newline at end of file +} diff --git a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutorTest.java b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutorTest.java index aeefd009c6..6df61e8844 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutorTest.java +++ b/trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutorTest.java @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making tRPC available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. + * Copyright (C) 2023 THL A29 Limited, a Tencent company. * All rights reserved. * * If you have downloaded a copy of the tRPC source code from Tencent, @@ -21,21 +21,14 @@ import com.tencent.trpc.core.rpc.def.DefProviderInvoker; import com.tencent.trpc.core.utils.NetUtils; import com.tencent.trpc.proto.standard.common.TRPCProtocol; -import java.net.InetSocketAddress; import javax.ws.rs.HttpMethod; -import org.eclipse.jetty.http.HttpFields; -import org.eclipse.jetty.http.HttpURI; -import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.server.HttpChannel; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpOutput; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * DefaultHttpExecutor test cases. @@ -76,22 +69,16 @@ public void testRegist() { connector.setAcceptQueueSize(60); server.addConnector(connector); - HttpChannel httpChannel = new HttpChannel(connector, new HttpConfiguration(), - null, null); - Request request = new Request(httpChannel, null); - request.setMetaData( - new MetaData.Request(HttpMethod.GET, - new HttpURI( - "http://localhost:8080/hello/trpc.test.rpc.Hello/sayHello?verison=1"), - HttpVersion.HTTP_1_0, new HttpFields())); - request.setMethod(HttpMethod.GET); - request.setPathInfo("/trpc.test.rpc.Hello/sayHello"); - request.setRemoteAddr(new InetSocketAddress("127.0.0.1", 8080)); - - Response response = new Response(new HttpChannel(connector, new HttpConfiguration(), - null, null), - new HttpOutput(new HttpChannel(connector, new HttpConfiguration(), null, - null))); + HttpChannel httpChannel = org.mockito.Mockito.mock(HttpChannel.class); + Request request = org.mockito.Mockito.mock(Request.class); + Response response = org.mockito.Mockito.mock(Response.class); + + org.mockito.Mockito.when(request.getMethod()).thenReturn(HttpMethod.GET); + org.mockito.Mockito.when(request.getPathInfo()).thenReturn("/trpc.test.rpc.Hello/sayHello"); + org.mockito.Mockito.when(request.getRemoteAddr()).thenReturn("127.0.0.1"); + org.mockito.Mockito.when(request.getRemotePort()).thenReturn(8080); + org.mockito.Mockito.when(request.getAttribute(org.mockito.ArgumentMatchers.anyString())).thenReturn(null); + HTTP_EXECUTOR.execute(request, response); } diff --git a/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterJavaBeanServiceImpl.java b/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterJavaBeanServiceImpl.java index 7e8e4bd989..d5102e0188 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterJavaBeanServiceImpl.java +++ b/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterJavaBeanServiceImpl.java @@ -18,7 +18,7 @@ import com.tencent.trpc.core.utils.Charsets; import com.tencent.trpc.core.utils.RpcContextUtils; import java.util.Map; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import tests.service.GreeterJavaBeanService; /** @@ -56,19 +56,19 @@ public ResponseBean assertAttachment(RpcContext context, RequestBean request) { responseBean.setMessage(request.getMessage()); responseBean.setInnerMsg(request.getInnerMsg()); Map attachments = context.getReqAttachMap(); - Assert.assertNotNull(attachments); - Assert.assertTrue(attachments.containsKey(TrpcTransInfoKeys.CALLER_CONTAINER_NAME)); - Assert.assertEquals("test-container", + Assertions.assertNotNull(attachments); + Assertions.assertTrue(attachments.containsKey(TrpcTransInfoKeys.CALLER_CONTAINER_NAME)); + Assertions.assertEquals("test-container", new String((byte[]) attachments.get(TrpcTransInfoKeys.CALLER_CONTAINER_NAME), Charsets.UTF_8)); - Assert.assertEquals("test-container", + Assertions.assertEquals("test-container", RpcContextUtils.getRequestAttachValue(context, TrpcTransInfoKeys.CALLER_CONTAINER_NAME)); - Assert.assertTrue(attachments.containsKey(TrpcTransInfoKeys.CALLER_SET_NAME)); - Assert.assertEquals("test-fullset", + Assertions.assertTrue(attachments.containsKey(TrpcTransInfoKeys.CALLER_SET_NAME)); + Assertions.assertEquals("test-fullset", new String((byte[]) attachments.get(TrpcTransInfoKeys.CALLER_SET_NAME), Charsets.UTF_8)); - Assert.assertEquals("test-fullset", + Assertions.assertEquals("test-fullset", RpcContextUtils.getRequestAttachValue(context, TrpcTransInfoKeys.CALLER_SET_NAME)); - Assert.assertTrue(attachments.containsKey("Connection")); - Assert.assertEquals("keep-alive", RpcContextUtils.getRequestAttachValue(context, "Connection")); + Assertions.assertTrue(attachments.containsKey("Connection")); + Assertions.assertEquals("keep-alive", RpcContextUtils.getRequestAttachValue(context, "Connection")); return responseBean; } } diff --git a/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterServiceImpl2.java b/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterServiceImpl2.java index 340bc73c4b..1f7b101a16 100644 --- a/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterServiceImpl2.java +++ b/trpc-proto/trpc-proto-http/src/test/java/tests/service/impl1/GreeterServiceImpl2.java @@ -24,7 +24,7 @@ import com.tencent.trpc.core.rpc.RpcContext; import java.nio.charset.StandardCharsets; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import tests.service.GreeterService; import tests.service.HelloRequestProtocol; import tests.service.TestBeanConvertWithGetMethodReq; @@ -35,13 +35,13 @@ public class GreeterServiceImpl2 implements GreeterService { @Override public HelloRequestProtocol.HelloResponse sayHello(RpcContext context, HelloRequestProtocol.HelloRequest request) { byte[] stringReqValue = (byte[]) context.getReqAttachMap().get(TEST_STRING_REQ_KEY); - Assert.assertEquals(new String(stringReqValue, StandardCharsets.UTF_8), TEST_STRING_REQ_VALUE); + Assertions.assertEquals(TEST_STRING_REQ_VALUE, new String(stringReqValue, StandardCharsets.UTF_8)); byte[] bytesReqValue = (byte[]) context.getReqAttachMap().get(TEST_BYTES_REQ_KEY); - Assert.assertArrayEquals(TEST_BYTES_REQ_VALUE, bytesReqValue); + Assertions.assertArrayEquals(TEST_BYTES_REQ_VALUE, bytesReqValue); String message = request.getMessage(); - Assert.assertEquals(TEST_MESSAGE, message); + Assertions.assertEquals(TEST_MESSAGE, message); context.getRspAttachMap().put(TEST_BYTES_RSP_KEY, TEST_BYTES_RSP_VALUE); context.getRspAttachMap().put(TEST_STRING_RSP_KEY, TEST_STRING_RSP_VALUE); diff --git a/trpc-proto/trpc-proto-http/src/test/resources/keystore.jks b/trpc-proto/trpc-proto-http/src/test/resources/keystore.jks index 9af5624fd3..257f5c4744 100644 Binary files a/trpc-proto/trpc-proto-http/src/test/resources/keystore.jks and b/trpc-proto/trpc-proto-http/src/test/resources/keystore.jks differ diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClientFilterTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClientFilterTest.java index f2f43cd1d5..d6f09dd763 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClientFilterTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClientFilterTest.java @@ -11,7 +11,7 @@ package com.tencent.trpc.proto.standard.clustertest; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.tencent.trpc.core.filter.spi.Filter; import com.tencent.trpc.core.rpc.CallInfo; @@ -19,7 +19,7 @@ import com.tencent.trpc.core.rpc.Request; import com.tencent.trpc.core.rpc.Response; import java.util.concurrent.CompletionStage; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; public class ClientFilterTest implements Filter { @@ -27,14 +27,14 @@ public class ClientFilterTest implements Filter { public CompletionStage filter(Invoker filterChain, Request req) { req.getMeta().addMessageType(100); CallInfo callInfo = req.getMeta().getCallInfo(); - Assert.assertEquals("calleeapp", callInfo.getCalleeApp()); - Assert.assertEquals("calleeserver", callInfo.getCalleeServer()); - Assert.assertEquals("calleemethod", callInfo.getCalleeMethod()); - Assert.assertEquals("calleeservice", callInfo.getCalleeService()); - Assert.assertEquals("callerapp", callInfo.getCallerApp()); - Assert.assertEquals("callerserver", callInfo.getCallerServer()); - Assert.assertEquals("callermethod", callInfo.getCallerMethod()); - Assert.assertEquals("callerservice", callInfo.getCallerService()); + Assertions.assertEquals("calleeapp", callInfo.getCalleeApp()); + Assertions.assertEquals("calleeserver", callInfo.getCalleeServer()); + Assertions.assertEquals("calleemethod", callInfo.getCalleeMethod()); + Assertions.assertEquals("calleeservice", callInfo.getCalleeService()); + Assertions.assertEquals("callerapp", callInfo.getCallerApp()); + Assertions.assertEquals("callerserver", callInfo.getCallerServer()); + Assertions.assertEquals("callermethod", callInfo.getCallerMethod()); + Assertions.assertEquals("callerservice", callInfo.getCallerService()); return filterChain.invoke(req).thenApply(r -> { assertEquals(200, r.getMeta().getMessageType()); return r; diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClusterTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClusterTest.java index 499942d680..1777d5c6e8 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClusterTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ClusterTest.java @@ -11,7 +11,7 @@ package com.tencent.trpc.proto.standard.clustertest; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; @@ -26,10 +26,10 @@ import com.tencent.trpc.core.rpc.RpcClientContext; import com.tencent.trpc.core.utils.Charsets; import com.tencent.trpc.proto.standard.common.HelloRequestProtocol; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ClusterTest { @@ -58,7 +58,7 @@ private static ServiceConfig getServiceConfig() { return serviceConfig; } - @Before + @BeforeEach public void before() { FilterManager.registerPlugin("serverTest", ServerFilterTest.class); FilterManager.registerPlugin("clientTest", ClientFilterTest.class); @@ -67,7 +67,7 @@ public void before() { startServer(); } - @After + @AfterEach public void stop() { ConfigManager.getInstance().stop(); if (serviceConfig != null) { @@ -108,9 +108,9 @@ public void testAttachmentAndCallInfo() { .setMessage(ByteString.copyFromUtf8("haha")).build()) .getMessage().toStringUtf8(); assertEquals("haha", message); - Assert.assertEquals("container", context.getCallInfo().getCallerContainerName()); - Assert.assertEquals("set", context.getCallInfo().getCallerSetName()); - Assert.assertEquals("reqAttachValue", + Assertions.assertEquals("container", context.getCallInfo().getCallerContainerName()); + Assertions.assertEquals("set", context.getCallInfo().getCallerSetName()); + Assertions.assertEquals("reqAttachValue", new String((byte[]) (context.getRspAttachMap().get("attachKey")), Charsets.UTF_8)); System.out.println(">>>[client]receive msg:" + message); } diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/GreeterServiceImpl.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/GreeterServiceImpl.java index cd785961aa..ba3e9e116b 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/GreeterServiceImpl.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/GreeterServiceImpl.java @@ -17,7 +17,7 @@ import com.tencent.trpc.core.rpc.RpcServerContext; import com.tencent.trpc.core.utils.Charsets; import com.tencent.trpc.proto.standard.common.HelloRequestProtocol; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; public class GreeterServiceImpl implements GreeterService { @@ -25,29 +25,29 @@ public class GreeterServiceImpl implements GreeterService { public HelloRequestProtocol.HelloResponse sayHello(RpcServerContext context, HelloRequestProtocol.HelloRequest request) { System.out.println(">>>[server]receive msg[" + TextFormat.shortDebugString(request) + "]"); - Assert.assertEquals("reqDyeingKey", context.getDyeingKey()); - Assert.assertEquals("reqAttachValue", + Assertions.assertEquals("reqDyeingKey", context.getDyeingKey()); + Assertions.assertEquals("reqAttachValue", new String((byte[]) context.getReqAttachMap().get("attachKey"), Charsets.UTF_8)); CallInfo callInfo = context.getCallInfo(); - Assert.assertEquals("trpc.calleeapp.calleeserver.calleeservice", callInfo.getCallee()); - Assert.assertEquals("calleeapp", callInfo.getCalleeApp()); - Assert.assertEquals("calleeserver", callInfo.getCalleeServer()); - Assert.assertEquals("sayHello", callInfo.getCalleeMethod()); - Assert.assertEquals("calleeservice", callInfo.getCalleeService()); - Assert.assertEquals("trpc.callerapp.callerserver.callerservice", callInfo.getCaller()); - Assert.assertEquals("callerapp", callInfo.getCallerApp()); - Assert.assertEquals("callerserver", callInfo.getCallerServer()); - Assert.assertEquals("", callInfo.getCallerMethod()); - Assert.assertEquals("callerservice", callInfo.getCallerService()); + Assertions.assertEquals("trpc.calleeapp.calleeserver.calleeservice", callInfo.getCallee()); + Assertions.assertEquals("calleeapp", callInfo.getCalleeApp()); + Assertions.assertEquals("calleeserver", callInfo.getCalleeServer()); + Assertions.assertEquals("sayHello", callInfo.getCalleeMethod()); + Assertions.assertEquals("calleeservice", callInfo.getCalleeService()); + Assertions.assertEquals("trpc.callerapp.callerserver.callerservice", callInfo.getCaller()); + Assertions.assertEquals("callerapp", callInfo.getCallerApp()); + Assertions.assertEquals("callerserver", callInfo.getCallerServer()); + Assertions.assertEquals("", callInfo.getCallerMethod()); + Assertions.assertEquals("callerservice", callInfo.getCallerService()); CallInfo clientCallInfo = context.newClientContext().getCallInfo(); - Assert.assertEquals("trpc.calleeapp.calleeserver.calleeservice", + Assertions.assertEquals("trpc.calleeapp.calleeserver.calleeservice", clientCallInfo.getCaller()); - Assert.assertEquals("calleeapp", clientCallInfo.getCallerApp()); - Assert.assertEquals("calleeserver", clientCallInfo.getCallerServer()); - Assert.assertEquals("sayHello", clientCallInfo.getCallerMethod()); - Assert.assertEquals("calleeservice", clientCallInfo.getCallerService()); + Assertions.assertEquals("calleeapp", clientCallInfo.getCallerApp()); + Assertions.assertEquals("calleeserver", clientCallInfo.getCallerServer()); + Assertions.assertEquals("sayHello", clientCallInfo.getCallerMethod()); + Assertions.assertEquals("calleeservice", clientCallInfo.getCallerService()); String message = request.getMessage().toStringUtf8(); HelloRequestProtocol.HelloResponse.Builder rspBuilder = diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ServerFilterTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ServerFilterTest.java index a73749c9a2..746726ab8a 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ServerFilterTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/clustertest/ServerFilterTest.java @@ -11,7 +11,7 @@ package com.tencent.trpc.proto.standard.clustertest; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.tencent.trpc.core.filter.spi.Filter; import com.tencent.trpc.core.rpc.CallInfo; diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardCodecTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardCodecTest.java index f200cc21e8..f50569df6c 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardCodecTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardCodecTest.java @@ -33,13 +33,13 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class StandardCodecTest { - @Before + @BeforeEach public void before() { ServerConfig serverConfig = new ServerConfig(); serverConfig.setServer("abc"); @@ -78,18 +78,18 @@ public void codecTest() throws NoSuchMethodException, SecurityException, Unsuppo Request serverRequest = (Request) standardServerCodec.decode(channel, nettyChannelBuffer); serverRequest.getAttachments().put("hello", "hello"); TRpcReqHead tRpcReqHead = serverRequest.getAttachReqHead(); - Assert.assertEquals(CompressType.GZIP, tRpcReqHead.getHead().getContentEncoding()); - Assert.assertEquals(8889521, serverRequest.getRequestId()); - Assert.assertEquals(serverRequest.getInvocation().getRpcMethodName(), "sayHello"); - Assert.assertEquals(serverRequest.getInvocation().getRpcServiceName(), "helloservice"); - Assert.assertTrue(ArrayUtils.isEquals(serverRequest.getAttachment("abc"), "abc".getBytes())); + Assertions.assertEquals(CompressType.GZIP, tRpcReqHead.getHead().getContentEncoding()); + Assertions.assertEquals(8889521, serverRequest.getRequestId()); + Assertions.assertEquals(serverRequest.getInvocation().getRpcMethodName(), "sayHello"); + Assertions.assertEquals(serverRequest.getInvocation().getRpcServiceName(), "helloservice"); + Assertions.assertTrue(ArrayUtils.isEquals(serverRequest.getAttachment("abc"), "abc".getBytes())); Object decode = ((DecodableValue) serverRequest.getInvocation().getArguments()[0]) .decode(HelloRequest.class, false); - Assert.assertEquals(((HelloRequest) decode).getMessage().toStringUtf8(), "hello standard"); - Assert.assertEquals(new String(((byte[]) serverRequest.getAttachment("key")), "UTF-8"), "value"); - Assert.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getCaller().toStringUtf8(), + Assertions.assertEquals(((HelloRequest) decode).getMessage().toStringUtf8(), "hello standard"); + Assertions.assertEquals(new String(((byte[]) serverRequest.getAttachment("key")), "UTF-8"), "value"); + Assertions.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getCaller().toStringUtf8(), "trpc..."); - Assert.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getFunc().toStringUtf8(), + Assertions.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getFunc().toStringUtf8(), "/helloservice/sayHello"); DefResponse serverSendResponse = new DefResponse(); serverSendResponse.setRequest(serverRequest); @@ -103,24 +103,24 @@ public void codecTest() throws NoSuchMethodException, SecurityException, Unsuppo DefResponse clientResponse = (DefResponse) standardClientCodec.decode(channel, nettyChannelBuffer); TRpcRspHead tRpcRspHead = clientResponse.getAttachRspHead(); - Assert.assertEquals(CompressType.GZIP, tRpcRspHead.getHead().getContentEncoding()); - Assert.assertEquals(clientResponse.getRequestId(), 8889521); - Assert.assertEquals( + Assertions.assertEquals(CompressType.GZIP, tRpcRspHead.getHead().getContentEncoding()); + Assertions.assertEquals(clientResponse.getRequestId(), 8889521); + Assertions.assertEquals( new String(((byte[]) clientResponse.getAttachment("rsp-key")), StandardCharsets.UTF_8), "value"); - Assert.assertEquals(((TRpcRspHead) clientResponse.getAttachRspHead()).getHead().getCallType(), + Assertions.assertEquals(((TRpcRspHead) clientResponse.getAttachRspHead()).getHead().getCallType(), TRPCProtocol.TrpcCallType.TRPC_UNARY_CALL_VALUE); Object clientRspDecode = ((DecodableValue) clientResponse.getValue()).decode(HelloResponse.class, false); - Assert.assertEquals(((HelloResponse) clientRspDecode).getMessage().toStringUtf8(), "response"); - Assert.assertEquals(new String((byte[]) clientResponse.getAttachment("key"), StandardCharsets.UTF_8), + Assertions.assertEquals(((HelloResponse) clientRspDecode).getMessage().toStringUtf8(), "response"); + Assertions.assertEquals(new String((byte[]) clientResponse.getAttachment("key"), StandardCharsets.UTF_8), "value"); - Assert.assertEquals(new String((byte[]) clientResponse.getAttachment("abc")), "abc"); + Assertions.assertEquals(new String((byte[]) clientResponse.getAttachment("abc")), "abc"); try { ((DecodableValue) clientResponse.getValue()).decode(DefResponse.class, false); - Assert.fail(); + Assertions.fail(); } catch (Exception e) { - Assert.assertTrue(e instanceof RuntimeException); - Assert.assertTrue(e.getMessage().contains("deserialize to")); + Assertions.assertTrue(e instanceof RuntimeException); + Assertions.assertTrue(e.getMessage().contains("deserialize to")); } } @@ -156,19 +156,19 @@ public void compressTest() throws NoSuchMethodException, SecurityException, Unsu Request serverRequest = (Request) standardServerCodec.decode(channel, nettyChannelBuffer); TRpcReqHead tRpcReqHead = serverRequest.getAttachReqHead(); - Assert.assertEquals(CompressType.NONE, tRpcReqHead.getHead().getContentEncoding()); - Assert.assertEquals(8889521, serverRequest.getRequestId()); - Assert.assertEquals(serverRequest.getInvocation().getRpcMethodName(), "sayHello"); - Assert.assertEquals(serverRequest.getInvocation().getRpcServiceName(), "helloservice"); - Assert.assertTrue(ArrayUtils.isEquals(serverRequest.getAttachment("abc"), "abc".getBytes())); + Assertions.assertEquals(CompressType.NONE, tRpcReqHead.getHead().getContentEncoding()); + Assertions.assertEquals(8889521, serverRequest.getRequestId()); + Assertions.assertEquals(serverRequest.getInvocation().getRpcMethodName(), "sayHello"); + Assertions.assertEquals(serverRequest.getInvocation().getRpcServiceName(), "helloservice"); + Assertions.assertTrue(ArrayUtils.isEquals(serverRequest.getAttachment("abc"), "abc".getBytes())); Object decode = ((DecodableValue) serverRequest.getInvocation().getArguments()[0]) .decode(HelloRequest.class, false); - Assert.assertEquals(((HelloRequest) decode).getMessage().toStringUtf8(), "hello standard"); - Assert.assertEquals(new String(((byte[]) serverRequest.getAttachment("key")), "UTF-8"), + Assertions.assertEquals(((HelloRequest) decode).getMessage().toStringUtf8(), "hello standard"); + Assertions.assertEquals(new String(((byte[]) serverRequest.getAttachment("key")), "UTF-8"), "value"); - Assert.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getCaller().toStringUtf8(), + Assertions.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getCaller().toStringUtf8(), "trpc..."); - Assert.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getFunc().toStringUtf8(), + Assertions.assertEquals(((TRpcReqHead) serverRequest.getAttachReqHead()).getHead().getFunc().toStringUtf8(), "/helloservice/sayHello"); DefResponse serverSendResponse = new DefResponse(); @@ -181,13 +181,13 @@ public void compressTest() throws NoSuchMethodException, SecurityException, Unsu standardServerCodec.encode(channel, nettyChannelBuffer, serverSendResponse); DefResponse clientResponse = (DefResponse) standardClientCodec.decode(channel, nettyChannelBuffer); TRpcReqHead tRpcReqHead1 = serverRequest.getAttachReqHead(); - Assert.assertEquals(CompressType.NONE, tRpcReqHead1.getHead().getContentEncoding()); - Assert.assertEquals(clientResponse.getRequestId(), 8889521); - Assert.assertEquals(new String(((byte[]) clientResponse.getAttachment("rsp-key")), "UTF-8"), "value"); - Assert.assertEquals(((TRpcRspHead) clientResponse.getAttachRspHead()).getHead().getCallType(), + Assertions.assertEquals(CompressType.NONE, tRpcReqHead1.getHead().getContentEncoding()); + Assertions.assertEquals(clientResponse.getRequestId(), 8889521); + Assertions.assertEquals(new String(((byte[]) clientResponse.getAttachment("rsp-key")), "UTF-8"), "value"); + Assertions.assertEquals(((TRpcRspHead) clientResponse.getAttachRspHead()).getHead().getCallType(), TRPCProtocol.TrpcCallType.TRPC_UNARY_CALL_VALUE); Object clientRspDecode = ((DecodableValue) clientResponse.getValue()).decode(HelloResponse.class, false); - Assert.assertEquals(((HelloResponse) clientRspDecode).getMessage().toStringUtf8(), "response"); + Assertions.assertEquals(((HelloResponse) clientRspDecode).getMessage().toStringUtf8(), "response"); } } diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardPackageTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardPackageTest.java index 515722907c..c0fe05111d 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardPackageTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/StandardPackageTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.proto.standard.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.protobuf.ByteString; import com.tencent.trpc.core.common.config.ProtocolConfig; @@ -21,7 +21,7 @@ import com.tencent.trpc.transport.netty.NettyChannelBuffer; import io.netty.buffer.UnpooledByteBufAllocator; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StandardPackageTest { diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcMockServerTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcMockServerTest.java index d763c9aeb1..2cdb7f32fe 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcMockServerTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcMockServerTest.java @@ -11,7 +11,7 @@ package com.tencent.trpc.proto.standard.common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.protobuf.ByteString; import com.tencent.trpc.core.common.ConfigManager; @@ -29,9 +29,9 @@ import com.tencent.trpc.proto.standard.common.HelloRequestProtocol.HelloRequest; import com.tencent.trpc.proto.standard.common.HelloRequestProtocol.HelloResponse; import com.tencent.trpc.proto.support.DefRpcClient; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TRpcMockServerTest { @@ -39,7 +39,7 @@ public class TRpcMockServerTest { BackendConfig backendConfig; RpcClient createRpcClient; - @Before + @BeforeEach public void before() { ConfigManager.stopTest(); ConfigManager.getInstance().startTest(); @@ -66,7 +66,7 @@ public void before() { clientConfig.setMockClass(GreeterServiceMockImp.class.getName()); } - @After + @AfterEach public void after() { ConfigManager.stopTest(); if (backendConfig != null) { diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcServerTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcServerTest.java index f4301fe20b..33340edf1c 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcServerTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/common/TRpcServerTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.proto.standard.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -48,10 +48,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.codec.binary.StringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TRpcServerTest { @@ -62,7 +62,7 @@ public class TRpcServerTest { RpcClient createRpcClient; ConsumerConfig helloClientConfig; - @Before + @BeforeEach public void before() { ConfigManager.stopTest(); ConfigManager.getInstance().startTest(); @@ -98,7 +98,7 @@ public void before() { helloClientConfig.setBackendConfig(helloBackendConfig); } - @After + @AfterEach public void after() { ConfigManager.stopTest(); if (serviceConfig != null) { @@ -456,7 +456,7 @@ public void testCommonMethod() { HelloRequest.Builder builder = HelloRequest.newBuilder(); builder.setMessage(ByteString.copyFromUtf8("hello")); HelloResponse response = helloClientConfig.getProxy().sayHello(new RpcClientContext(), builder.build()); - Assert.assertEquals(response.getMessage().toStringUtf8(), "hello response"); + Assertions.assertEquals(response.getMessage().toStringUtf8(), "hello response"); } @Test @@ -465,12 +465,12 @@ public void testDefaultMethod() { builder.setMessage(ByteString.copyFromUtf8("hello")); HelloServiceApi serviceApi = helloClientConfig.getProxy(); HelloResponse response = serviceApi.doDefaultMethod(new RpcClientContext(), builder.build()); - Assert.assertEquals(response.getMessage().toStringUtf8(), "this is default method"); + Assertions.assertEquals(response.getMessage().toStringUtf8(), "this is default method"); response = serviceApi.doUnExitedMethod(new RpcClientContext(), builder.build()); - Assert.assertEquals(response.getMessage().toStringUtf8(), "this is default method"); + Assertions.assertEquals(response.getMessage().toStringUtf8(), "this is default method"); try { clientConfig.getProxy().sayHellox(new RpcClientContext(), builder.build()); - Assert.fail(); + Assertions.fail(); } catch (Exception ex) { assertTrue(ex instanceof TRpcException && ((TRpcException) ex).getCode() == ErrorCode.TRPC_SERVER_NOFUNC_ERR); @@ -485,7 +485,7 @@ public void testGenericMethod() throws InvalidProtocolBufferException { byte[] resBytes = helloClientConfig.getProxy().doGenericMethod(new RpcClientContext(), reqBytes); HelloResponse response = HelloResponse.parseFrom(resBytes); - Assert.assertArrayEquals("this is generic method".getBytes(StandardCharsets.UTF_8), + Assertions.assertArrayEquals("this is generic method".getBytes(StandardCharsets.UTF_8), response.getMessage().toByteArray()); } diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/TcpConcurrentTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/TcpConcurrentTest.java index 313cfa1c5e..bbd49e6326 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/TcpConcurrentTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/TcpConcurrentTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.proto.standard.concurrenttest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.protobuf.ByteString; import com.tencent.trpc.core.common.ConfigManager; @@ -26,9 +26,9 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TcpConcurrentTest { @@ -45,14 +45,14 @@ private static ServiceConfig getServiceConfig() { return serviceConfig; } - @Before + @BeforeEach public void before() { ConfigManager.stopTest(); ConfigManager.startTest(); startServer(); } - @After + @AfterEach public void stop() { ConfigManager.stopTest(); if (serviceConfig != null) { diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/UdpConcurrentTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/UdpConcurrentTest.java index 5b42b37b59..627318eb6d 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/UdpConcurrentTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/concurrenttest/UdpConcurrentTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.proto.standard.concurrenttest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.protobuf.ByteString; import com.tencent.trpc.core.common.ConfigManager; @@ -26,9 +26,9 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class UdpConcurrentTest { @@ -44,14 +44,14 @@ private static ServiceConfig getServiceConfig() { return serviceConfig; } - @Before + @BeforeEach public void before() { ConfigManager.stopTest(); ConfigManager.startTest(); startServer(); } - @After + @AfterEach public void stop() { ConfigManager.stopTest(); if (serviceConfig != null) { diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/StreamTests.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/StreamTests.java index 4d27c1803e..a51901bb56 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/StreamTests.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/StreamTests.java @@ -41,10 +41,10 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscription; import reactor.core.publisher.BaseSubscriber; import reactor.core.publisher.Flux; @@ -55,7 +55,7 @@ public class StreamTests { ServiceConfig serviceConfig; StreamGreeterServiceImpl1 streamGreeterService = new StreamGreeterServiceImpl1(); - @Before + @BeforeEach public void before() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -63,7 +63,7 @@ public void before() { this.streamGreeterService.reset(); } - @After + @AfterEach public void stop() { ConfigManager.stopTest(); if (serviceConfig != null) { @@ -115,7 +115,7 @@ public void testDuplexStream() throws InterruptedException { countDownLatch.await(1, TimeUnit.MINUTES); } - Assert.assertEquals(2 * times * batch, count.get()); + Assertions.assertEquals(2 * times * batch, count.get()); } @Test @@ -161,7 +161,7 @@ public void testClientStream() throws InterruptedException { countDownLatch.await(1, TimeUnit.MINUTES); } - Assert.assertEquals(2 * times, count.get()); + Assertions.assertEquals(2 * times, count.get()); } @Test @@ -201,22 +201,22 @@ public void testServerStream() throws InterruptedException { countDownLatch.await(1, TimeUnit.MINUTES); } - Assert.assertEquals(2 * times * batch, count.get()); + Assertions.assertEquals(2 * times * batch, count.get()); final AtomicInteger failedCount = new AtomicInteger(); Flux resp = proxy .serverSayHellos(new RpcClientContext(), HelloRequest.newBuilder().setMessage("exception").build()); resp - .doOnNext(rsp -> Assert.fail("should not got response " + resp)) + .doOnNext(rsp -> Assertions.fail("should not got response " + resp)) .doOnError(t -> { - Assert.assertNotNull("exception is null", t); + Assertions.assertNotNull(t, "exception is null"); System.out.println("got expected exception: " + t.getMessage()); failedCount.incrementAndGet(); }) .then(Mono.never()) .onErrorReturn(HelloResponse.newBuilder().build()) .block(); - Assert.assertEquals(1, failedCount.get()); + Assertions.assertEquals(1, failedCount.get()); } @Test @@ -249,8 +249,8 @@ public void testStreamBuildTimeout() throws Exception { latch.await(1, TimeUnit.MINUTES); - Assert.assertEquals(0, rspCount.get()); - Assert.assertEquals(times, errCount.get()); + Assertions.assertEquals(0, rspCount.get()); + Assertions.assertEquals(times, errCount.get()); } @Test @@ -287,8 +287,8 @@ public void testRemoteNotExist() throws Exception { latch.await(1, TimeUnit.MINUTES); - Assert.assertEquals(0, rspCount.get()); - Assert.assertEquals(2, errCount.get()); + Assertions.assertEquals(0, rspCount.get()); + Assertions.assertEquals(2, errCount.get()); } @Test @@ -314,8 +314,8 @@ public void testCompressedMessage() throws Exception { latch.await(1, TimeUnit.MINUTES); - Assert.assertEquals(batch, rspCount.get()); - Assert.assertEquals(0, errCount.get()); + Assertions.assertEquals(batch, rspCount.get()); + Assertions.assertEquals(0, errCount.get()); } @Test @@ -344,8 +344,8 @@ public void testNotValidStreamMethod() throws Exception { latch.await(1, TimeUnit.MINUTES); - Assert.assertEquals(0, rspCount.get()); - Assert.assertEquals(times, errCount.get()); + Assertions.assertEquals(0, rspCount.get()); + Assertions.assertEquals(times, errCount.get()); } @Test @@ -357,10 +357,10 @@ public void testMultiProtocolTypeService() { providerConfig.setRefClazz(StreamGreeterServiceImpl3.class.getCanonicalName()); startServer(serviceConfig, Collections.singletonList(providerConfig)); - Assert.fail("do not support service with multi protocol types"); + Assertions.fail("do not support service with multi protocol types"); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } try { @@ -372,10 +372,10 @@ public void testMultiProtocolTypeService() { providerConfig2.setRefClazz(StreamGreeterServiceImpl1.class.getCanonicalName()); // stream startServer(serviceConfig, Arrays.asList(providerConfig1, providerConfig2)); - Assert.fail("do not support services with different protocol types"); + Assertions.fail("do not support services with different protocol types"); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } } @@ -388,10 +388,10 @@ public void testMultiProtocolTypeClient() { consumerConfig.setServiceInterface(StreamGreeterService4.class); StreamGreeterService4 proxy = backendConfig.getProxy(consumerConfig); proxy.sayHello(new RpcClientContext(), HelloRequest.newBuilder().build()); - Assert.fail("do not support service with multi protocol types"); + Assertions.fail("do not support service with multi protocol types"); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof TRpcException); + Assertions.assertTrue(e instanceof TRpcException); } } @@ -426,19 +426,19 @@ public void testNoBindDuplexStream() throws Exception { connectedLatch.await(1, TimeUnit.MINUTES); HelloResponse helloResponse = responseHolder.get(); System.out.println(Thread.currentThread().getName() + ">>>>got response: " + helloResponse); - Assert.assertNotNull(helloResponse); - Assert.assertEquals(flag, helloResponse.getMessage()); + Assertions.assertNotNull(helloResponse); + Assertions.assertEquals(flag, helloResponse.getMessage()); // check the unbound server stream consumer stats CountDownLatch latch = streamGreeterService.getLatch(flag); - Assert.assertNotNull(latch); + Assertions.assertNotNull(latch); latch.await(1, TimeUnit.MINUTES); int stat = streamGreeterService.getStat(flag); - Assert.assertEquals(count, stat); + Assertions.assertEquals(count, stat); // check the response stream stats resultLatch.await(1, TimeUnit.MINUTES); - Assert.assertEquals(1, responseCount.get()); + Assertions.assertEquals(1, responseCount.get()); } @Test @@ -459,9 +459,9 @@ public void testTransferError() throws Exception { .subscribe(null, ex -> exHolder[0] = ex); latch.await(1, TimeUnit.MINUTES); - Assert.assertNotNull(exHolder[0]); + Assertions.assertNotNull(exHolder[0]); System.out.println(">>>>got transfered error: " + exHolder[0].getMessage()); - Assert.assertTrue(exHolder[0].getMessage().contains(error.toString())); + Assertions.assertTrue(exHolder[0].getMessage().contains(error.toString())); } @Test @@ -506,8 +506,8 @@ protected void hookOnNext(HelloResponse value) { + ", actual: " + actual); try { - Assert.assertTrue("expect less than " + maxExpect + " got " + actual, - actual <= maxExpect); + Assertions.assertTrue(actual <= maxExpect, + "expect less than " + maxExpect + " got " + actual); } catch (Throwable t) { exception.compareAndSet(null, t); } diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameCodecTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameCodecTest.java index c697bc5152..0d888ba214 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameCodecTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameCodecTest.java @@ -19,8 +19,8 @@ import com.tencent.trpc.proto.standard.stream.codec.TRpcStreamFrameCodec.RpcCallInfo; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TRpcStreamFrameCodecTest { @@ -29,23 +29,23 @@ public void encodeStreamInitRequestFrame() { try { TRpcStreamFrameCodec.encodeStreamInitRequestFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getCallInfo(), getBackendConfig("notExist", "notExist")); - Assert.fail("check invalid serialization failed, should throw an exception"); + Assertions.fail("check invalid serialization failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } try { TRpcStreamFrameCodec.encodeStreamInitRequestFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getCallInfo(), getBackendConfig(PBSerialization.NAME, "notExist")); - Assert.fail("check invalid compressor failed, should throw an exception"); + Assertions.fail("check invalid compressor failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } ByteBuf frame = TRpcStreamFrameCodec.encodeStreamInitRequestFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getCallInfo(), getBackendConfig(PBSerialization.NAME, SnappyCompressor.NAME)); - Assert.assertNotNull(frame); - Assert.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, + Assertions.assertNotNull(frame); + Assertions.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, TRpcStreamFrameHeaderCodec.frameType(frame).getEncodedType()); } @@ -54,30 +54,30 @@ public void encodeStreamInitResponseFrame() { try { TRpcStreamFrameCodec.encodeStreamInitResponseFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getProtocolConfig("notExist", "notExist"), 0, "OK"); - Assert.fail("check invalid serialization failed, should throw an exception"); + Assertions.fail("check invalid serialization failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } try { TRpcStreamFrameCodec.encodeStreamInitResponseFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getProtocolConfig(PBSerialization.NAME, "notExist"), 0, "OK"); - Assert.fail("check invalid compressor failed, should throw an exception"); + Assertions.fail("check invalid compressor failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } ByteBuf frame = TRpcStreamFrameCodec.encodeStreamInitResponseFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getProtocolConfig(PBSerialization.NAME, SnappyCompressor.NAME), 0, "OK"); - Assert.assertNotNull(frame); - Assert.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, + Assertions.assertNotNull(frame); + Assertions.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, TRpcStreamFrameHeaderCodec.frameType(frame).getEncodedType()); // 异常情况不检查serialization和compressor ByteBuf frame2 = TRpcStreamFrameCodec.encodeStreamInitResponseFrame(UnpooledByteBufAllocator.DEFAULT, 0, 0, getProtocolConfig("notExist", "notExist"), 404, "FAIL"); - Assert.assertNotNull(frame2); - Assert.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, + Assertions.assertNotNull(frame2); + Assertions.assertEquals(TrpcStreamFrameType.TRPC_STREAM_FRAME_INIT_VALUE, TRpcStreamFrameHeaderCodec.frameType(frame2).getEncodedType()); } @@ -128,4 +128,4 @@ private RpcCallInfo getCallInfo() { "trpc.testApp.testServer.testService2", "/trpc.testApp.testServer.testService2/func1"); } -} \ No newline at end of file +} diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameDecoderTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameDecoderTest.java index a0be6df8ab..e880b537f6 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameDecoderTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameDecoderTest.java @@ -18,8 +18,8 @@ import com.tencent.trpc.proto.standard.common.TRpcFrameType; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TRpcStreamFrameDecoderTest { @@ -34,22 +34,22 @@ public void testNormalDecode() { ByteBuf decoded = frameDecoder.decode(frame); int decodedFrameSize = decoded.readableBytes(); - Assert.assertEquals(0, frame.readableBytes()); - Assert.assertTrue(decodedFrameSize > 0); - Assert.assertEquals(frameSize, decodedFrameSize); + Assertions.assertEquals(0, frame.readableBytes()); + Assertions.assertTrue(decodedFrameSize > 0); + Assertions.assertEquals(frameSize, decodedFrameSize); - Assert.assertNull(frameDecoder.decode(frame)); + Assertions.assertNull(frameDecoder.decode(frame)); frame.writeByte(0); - Assert.assertEquals(decodedFrameSize, decoded.readableBytes()); + Assertions.assertEquals(decodedFrameSize, decoded.readableBytes()); } } @Test public void testNotEnoughData() { TRpcStreamFrameDecoder frameDecoder = new TRpcStreamFrameDecoder(); - Assert.assertNull(frameDecoder.decode(getNotEnoughHeaderTRpcFrame())); - Assert.assertNull(frameDecoder.decode(getNotEnoughDataTRpcFrame(100))); + Assertions.assertNull(frameDecoder.decode(getNotEnoughHeaderTRpcFrame())); + Assertions.assertNull(frameDecoder.decode(getNotEnoughDataTRpcFrame(100))); } @Test @@ -57,9 +57,9 @@ public void testInvalidMagicFrame() { TRpcStreamFrameDecoder frameDecoder = new TRpcStreamFrameDecoder(); try { frameDecoder.decode(getInvalidMagicTRpcFrame()); - Assert.fail("check unknown magic failed, should throw an exception"); + Assertions.fail("check unknown magic failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof TRpcException); + Assertions.assertTrue(e instanceof TRpcException); } } @@ -79,10 +79,10 @@ public void testMultiNormalFrames() { if (decoded == null) { break; } - Assert.assertEquals(singleFrameSize, decoded.readableBytes()); + Assertions.assertEquals(singleFrameSize, decoded.readableBytes()); got++; } - Assert.assertEquals(count, got); + Assertions.assertEquals(count, got); } private ByteBuf getNormalTRpcFrame(int streamID, TRpcFrameType frameType) { @@ -138,9 +138,9 @@ private void fillNormalEmptyFrame(ByteBuf frame, int streamId, TRpcFrameType fra @Test public void testErrorCodeStream() { - Assert.assertNotNull(Stream.FRAME_DECODE_MAGIC_ERR.getMessage()); - Assert.assertNotNull(Stream.FRAME_DECODE_MAGIC_ERR.getStatusCode()); + Assertions.assertNotNull(Stream.FRAME_DECODE_MAGIC_ERR.getMessage()); + Assertions.assertNotNull(Stream.FRAME_DECODE_MAGIC_ERR.getStatusCode()); } -} \ No newline at end of file +} diff --git a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameHeaderCodecTest.java b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameHeaderCodecTest.java index b96ca47836..8f0c292cbc 100644 --- a/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameHeaderCodecTest.java +++ b/trpc-proto/trpc-proto-standard/src/test/java/com/tencent/trpc/proto/standard/stream/codec/TRpcStreamFrameHeaderCodecTest.java @@ -16,8 +16,8 @@ import com.tencent.trpc.proto.standard.common.TRpcFrameType; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TRpcStreamFrameHeaderCodecTest { @@ -34,26 +34,26 @@ public void tesetNormalFrame() { } private void checkNormalFrame(ByteBuf frame, int streamId, TRpcFrameType frameType) { - Assert.assertEquals(TRpcStreamFrameHeaderCodec.magic(frame), StandardFrame.TRPC_MAGIC); - Assert.assertEquals(TRpcStreamFrameHeaderCodec.frameSize(frame), frame.readableBytes()); - Assert.assertEquals(TRpcStreamFrameHeaderCodec.streamId(frame), streamId); - Assert.assertEquals(TRpcStreamFrameHeaderCodec.frameType(frame), frameType); + Assertions.assertEquals(TRpcStreamFrameHeaderCodec.magic(frame), StandardFrame.TRPC_MAGIC); + Assertions.assertEquals(TRpcStreamFrameHeaderCodec.frameSize(frame), frame.readableBytes()); + Assertions.assertEquals(TRpcStreamFrameHeaderCodec.streamId(frame), streamId); + Assertions.assertEquals(TRpcStreamFrameHeaderCodec.frameType(frame), frameType); } @Test public void testUnknownFrame() { try { TRpcStreamFrameHeaderCodec.frameType(getAbnormalDataTypeTRpcFrame()); - Assert.fail("check unknown dataType failed, should throw an exception"); + Assertions.fail("check unknown dataType failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } try { TRpcStreamFrameHeaderCodec.frameType(getAbnormalFrameTypeTRpcFrame()); - Assert.fail("check unknown frameType failed, should throw an exception"); + Assertions.fail("check unknown frameType failed, should throw an exception"); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } } @@ -92,4 +92,4 @@ private ByteBuf getAbnormalFrameTypeTRpcFrame() { buffer.writeShort(0); // reserved return buffer; } -} \ No newline at end of file +} diff --git a/trpc-proto/trpc-rpc-support/src/test/java/com/tencent/trpc/proto/support/DefResponseFutureTest.java b/trpc-proto/trpc-rpc-support/src/test/java/com/tencent/trpc/proto/support/DefResponseFutureTest.java index fcd7c0a578..5c36963f7e 100644 --- a/trpc-proto/trpc-rpc-support/src/test/java/com/tencent/trpc/proto/support/DefResponseFutureTest.java +++ b/trpc-proto/trpc-rpc-support/src/test/java/com/tencent/trpc/proto/support/DefResponseFutureTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.proto.support; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.tencent.trpc.core.common.config.ConsumerConfig; import com.tencent.trpc.core.common.config.ProtocolConfig; @@ -30,7 +30,7 @@ import com.tencent.trpc.transport.netty.NettyClientTransportFactory; import java.lang.reflect.Field; import java.util.concurrent.ConcurrentMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefResponseFutureTest { diff --git a/trpc-transport/trpc-transport-http/pom.xml b/trpc-transport/trpc-transport-http/pom.xml index a5cfcf917c..9f5f2365a3 100644 --- a/trpc-transport/trpc-transport-http/pom.xml +++ b/trpc-transport/trpc-transport-http/pom.xml @@ -45,6 +45,10 @@ org.eclipse.jetty jetty-alpn-conscrypt-server + + org.eclipse.jetty + jetty-alpn-java-server + org.slf4j diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/Constants.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/Constants.java index 5747c90e1a..305da0afea 100644 --- a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/Constants.java +++ b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/Constants.java @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making tRPC available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. + * Copyright (C) 2023 THL A29 Limited, a Tencent company. * All rights reserved. * * If you have downloaded a copy of the tRPC source code from Tencent, @@ -48,4 +48,6 @@ public class Constants { */ public static final String KEYSTORE_PASS = "keystore_pass"; + public static final String HTTPS = "HTTPS"; + } diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java index 03ab322c24..88ca0b08eb 100644 --- a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java +++ b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making tRPC available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. + * Copyright (C) 2023 THL A29 Limited, a Tencent company. * All rights reserved. * * If you have downloaded a copy of the tRPC source code from Tencent, @@ -18,6 +18,7 @@ import com.tencent.trpc.core.common.config.ProtocolConfig; import com.tencent.trpc.transport.http.HttpExecutor; +import com.tencent.trpc.transport.http.common.Constants; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -54,7 +55,8 @@ public ServerConnector getServerConnector(Server server) { sslContextFactory .setKeyStorePassword(String.valueOf(config.getExtMap().get(KEYSTORE_PASS))); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); - sslContextFactory.setProvider("Conscrypt"); + sslContextFactory.setSniRequired(false); + sslContextFactory.setEndpointIdentificationAlgorithm(Constants.HTTPS); // 2. Configure http protocol HttpConfiguration httpConfig = new HttpConfiguration(); diff --git a/trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2ServerTest.java b/trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2ServerTest.java index cb47a9ae71..87d56546c0 100644 --- a/trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2ServerTest.java +++ b/trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2ServerTest.java @@ -40,8 +40,10 @@ import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.apache.hc.core5.http2.ssl.ConscryptClientTlsStrategy; +import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; import org.apache.hc.core5.ssl.SSLContexts; +import org.apache.hc.core5.ssl.TrustStrategy; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -97,11 +99,15 @@ public static void beforeClass() throws CertificateException, NoSuchAlgorithmExc String keyStorePath = String.valueOf(path); String keyStorePass = "init234"; final SSLContext sslContext = SSLContexts.custom() - .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray()) + .loadTrustMaterial(new File(keyStorePath), keyStorePass.toCharArray(), + (TrustStrategy) (chain, authType) -> true) .build(); final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder - .create().useSystemProperties() - .setTlsStrategy(new ConscryptClientTlsStrategy(sslContext)) + .create() + .setTlsStrategy(ClientTlsStrategyBuilder.create() + .setSslContext(sslContext) + .setHostnameVerifier(NoopHostnameVerifier.INSTANCE) + .build()) .build(); httpAsyncClient = HttpAsyncClients.custom() .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_2).setConnectionManager(cm) diff --git a/trpc-transport/trpc-transport-http/src/test/resources/keystore.jks b/trpc-transport/trpc-transport-http/src/test/resources/keystore.jks index 9af5624fd3..b657bf2ee9 100644 Binary files a/trpc-transport/trpc-transport-http/src/test/resources/keystore.jks and b/trpc-transport/trpc-transport-http/src/test/resources/keystore.jks differ