optimize transport test

pom.xml

@@ -104,6 +104,8 @@
         <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
         <exec.maven.version>3.1.0</exec.maven.version>
         <junit.version>5.14.2</junit.version>
+        <mockito-core.version>5.21.0</mockito-core.version>
+        <mockito-inline.version>5.2.0</mockito-inline.version>
         <file.encoding>UTF-8</file.encoding>
     </properties>
 
@@ -146,6 +148,24 @@
             <classifier>runtime</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>${mockito-inline.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

trpc-dependencies/trpc-dependencies-bom/pom.xml

@@ -83,9 +83,9 @@
         <gson.version>2.8.9</gson.version>
         <guava.version>32.1.3-jre</guava.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <httpclient5.version>5.4.1</httpclient5.version>
+        <httpclient5.version>5.3.1</httpclient5.version>
         <httpcore.version>4.4.15</httpcore.version>
-        <httpcore5.version>5.2.1</httpcore5.version>
+        <httpcore5.version>5.2.5</httpcore5.version>
         <hutool.all.version>5.8.28</hutool.all.version>
         <jackson.version>2.15.0-rc2</jackson.version>
         <jakarta.servlet.version>6.0.0</jakarta.servlet.version>

trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/ExecutorDispatcherTest.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,
@@ -17,17 +17,17 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import org.powermock.api.mockito.PowerMockito;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 public class ExecutorDispatcherTest {
 
     @Test
     public void test() throws ServletException, IOException {
         ExecutorDispatcher dispatcher = new ExecutorDispatcher();
-        HttpServletRequest req = PowerMockito.mock(HttpServletRequest.class);
-        PowerMockito.when(req.getLocalPort()).thenReturn(1024);
-        HttpServletResponse rsp = PowerMockito.mock(HttpServletResponse.class);
+        HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
+        Mockito.when(req.getLocalPort()).thenReturn(1024);
+        HttpServletResponse rsp = Mockito.mock(HttpServletResponse.class);
         dispatcher.service(req, rsp);
         org.mockito.Mockito.verify(rsp, times(1)).sendError(404,
                 "HttpExecutor is closed: port is:1024.");

trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2ServerTest.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,
@@ -14,7 +14,7 @@
 import static com.tencent.trpc.transport.http.common.Constants.HTTP2_SCHEME;
 import static com.tencent.trpc.transport.http.common.Constants.KEYSTORE_PASS;
 import static com.tencent.trpc.transport.http.common.Constants.KEYSTORE_PATH;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.tencent.trpc.core.common.config.ProtocolConfig;
 import com.tencent.trpc.core.extension.ExtensionLoader;
@@ -43,10 +43,10 @@
 import org.apache.hc.core5.http2.ssl.ConscryptClientTlsStrategy;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.eclipse.jetty.http.HttpStatus;
-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;
 
 public class JettyHttp2ServerTest {
 
@@ -56,7 +56,7 @@
 
     private static CloseableHttpAsyncClient httpAsyncClient;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws CertificateException, NoSuchAlgorithmException,
             KeyStoreException, IOException, KeyManagementException {
         ProtocolConfig protocolConfig = ProtocolConfig.newInstance();
@@ -109,7 +109,7 @@
         httpAsyncClient.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (httpServer != null) {
             httpServer.open();
@@ -146,14 +146,14 @@
                     }
                 });
         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("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
     @Test
@@ -178,14 +178,14 @@
                     }
                 });
         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());
-        Assert.assertEquals("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
 }

trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttp2cServerTest.java

@@ -12,7 +12,7 @@
 package com.tencent.trpc.transport.http;
 
 import static com.tencent.trpc.transport.http.common.Constants.HTTP2_SCHEME;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.tencent.trpc.core.common.config.ProtocolConfig;
 import com.tencent.trpc.core.extension.ExtensionLoader;
@@ -34,10 +34,10 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.eclipse.jetty.http.HttpStatus;
-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;
 
 public class JettyHttp2cServerTest {
 
@@ -49,7 +49,7 @@
 
     private static CloseableHttpClient httpClient;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
         ProtocolConfig protocolConfig = ProtocolConfig.newInstance();
         protocolConfig.setIp("localhost");
@@ -88,7 +88,7 @@
         httpClient = HttpClients.custom().build();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (httpServer != null) {
             httpServer.open();
@@ -125,14 +125,14 @@
                     }
                 });
         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("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
     @Test
@@ -157,14 +157,14 @@
                     }
                 });
         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());
-        Assert.assertEquals("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
     @Test
@@ -175,10 +175,10 @@
 
         int responseCode = httpResponse.getStatusLine().getStatusCode();
         logger.info("response code is {}", responseCode);
-        Assert.assertEquals(responseCode, 200);
+        Assertions.assertEquals(responseCode, 200);
 
-        Assert.assertEquals(httpResponse.getProtocolVersion().getProtocol(), "HTTP");
-        Assert.assertEquals(httpResponse.getProtocolVersion().getMajor(), 1);
+        Assertions.assertEquals(httpResponse.getProtocolVersion().getProtocol(), "HTTP");
+        Assertions.assertEquals(httpResponse.getProtocolVersion().getMajor(), 1);
 
     }
 
@@ -190,10 +190,10 @@
 
         int responseCode = httpResponse.getStatusLine().getStatusCode();
         logger.info("response code is {}", responseCode);
-        Assert.assertEquals(responseCode, 404);
+        Assertions.assertEquals(responseCode, 404);
 
-        Assert.assertEquals(httpResponse.getProtocolVersion().getProtocol(), "HTTP");
-        Assert.assertEquals(httpResponse.getProtocolVersion().getMajor(), 1);
+        Assertions.assertEquals(httpResponse.getProtocolVersion().getProtocol(), "HTTP");
+        Assertions.assertEquals(httpResponse.getProtocolVersion().getMajor(), 1);
 
     }
 

trpc-transport/trpc-transport-http/src/test/java/com/tencent/trpc/transport/http/JettyHttpsServerTest.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,
@@ -14,7 +14,7 @@
 import static com.tencent.trpc.transport.http.common.Constants.HTTP_SCHEME;
 import static com.tencent.trpc.transport.http.common.Constants.KEYSTORE_PASS;
 import static com.tencent.trpc.transport.http.common.Constants.KEYSTORE_PATH;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.tencent.trpc.core.common.config.ProtocolConfig;
 import com.tencent.trpc.core.extension.ExtensionLoader;
@@ -40,13 +40,15 @@
 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.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;
 
 public class JettyHttpsServerTest {
 
@@ -56,7 +58,7 @@
 
     private static CloseableHttpAsyncClient httpAsyncClient;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws CertificateException, NoSuchAlgorithmException,
             KeyStoreException, IOException, KeyManagementException {
         ProtocolConfig protocolConfig = ProtocolConfig.newInstance();
@@ -97,19 +99,23 @@
         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_1).setConnectionManager(cm)
                 .build();
         httpAsyncClient.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (httpServer != null) {
             httpServer.open();
@@ -146,14 +152,14 @@
                     }
                 });
         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("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
     @Test
@@ -178,14 +184,14 @@
                     }
                 });
         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());
-        Assert.assertEquals("", simpleHttpResponse.getBodyText());
+        Assertions.assertEquals("", simpleHttpResponse.getBodyText());
     }
 
 }