feat: optimize trpc-test

Author: wardseptember

.gitignore

@@ -38,6 +38,7 @@ trpc-selector/trpc-selector-open-polaris/polaris
 trpc-registry/trpc-registry-open-polaris/polaris
 **/target
 deploy.sh
+**/jacoco.exec
 
 # Codecc
 .codecc

pom.xml

@@ -103,7 +103,7 @@
         <jacoco.version>0.8.11</jacoco.version>
         <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>
+        <junit.version>5.12.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>

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

@@ -100,7 +100,7 @@
         <jetty.version>11.0.25</jetty.version>
         <joda-time.version>2.7</joda-time.version>
         <jprotobuf.version>2.4.14</jprotobuf.version>
-        <junit.version>5.14.2</junit.version>
+        <junit.version>5.12.2</junit.version>
         <javassist.version>3.30.2-GA</javassist.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <jsr305.version>3.0.2</jsr305.version>

trpc-test/pom.xml

@@ -24,8 +24,8 @@
 
         <google.android.annotations.version>4.1.1.4</google.android.annotations.version>
         <!-- reactor-bom and springboot need to be consistent with the version of the jar package in the trpc-dependencies-bom.pom.xml file -->
-        <reactor-bom.version>2020.0.21</reactor-bom.version>
-        <springboot.version>2.7.10</springboot.version>
+        <reactor-bom.version>2022.0.9</reactor-bom.version>
+        <springboot.version>3.5.0</springboot.version>
     </properties>
 
     <dependencyManagement>
@@ -57,6 +57,16 @@
                 <artifactId>annotations</artifactId>
                 <version>${google.android.annotations.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

trpc-test/trpc-test-integration/pom.xml

@@ -15,7 +15,7 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
     </properties>
 
     <profiles>
@@ -49,6 +49,11 @@
             <artifactId>spring-boot-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -68,11 +73,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -183,30 +183,22 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <!-- Skips unit tests if the value of skip.unit.tests property is true -->
-                    <skipTests>${skip.unit.tests}</skipTests>
-                    <!-- Excludes integration tests when unit tests are run -->
-                    <excludes>
-                        <exclude>**/IT*.java</exclude>
-                    </excludes>
+                    <skip>${skip.unit.tests}</skip>
+                    <reuseForks>false</reuseForks>
+                    <forkCount>1</forkCount>
+                    <includes>
+                        <include>**/*Test.java</include>
+                        <include>**/Test*.java</include>
+                    </includes>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <skipTests>${skip.integration.tests}</skipTests>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>

trpc-test/trpc-test-integration/src/integration-test/java/TestDemo.java

@@ -9,13 +9,10 @@
  * A copy of the Apache 2.0 License can be found in the LICENSE file.
  */
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestDemo.class)
 @ActiveProfiles("integration-test")
 public class TestDemo {

trpc-test/trpc-test-integration/src/integration-test/java/com/tencent/trpc/integration/test/stream/StreamIntegrationTest.java

@@ -21,6 +21,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -39,6 +40,7 @@
  */
 @ActiveProfiles("stream")
 @SpringBootTest(classes = TrpcServerApplication.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class StreamIntegrationTest {
 
     private final ExecutorService executor = Executors.newCachedThreadPool();

trpc-test/trpc-test-integration/src/integration-test/java/com/tencent/trpc/integration/test/stub/StreamingEchoAPIImpl.java

@@ -38,10 +38,13 @@ public Mono<EchoResponse> clientStreamEcho(RpcContext context, Publisher<EchoReq
                     LOGGER.info("got req {}", req.getMessage());
                     counter.incrementAndGet();
                 })
+                .onErrorResume(e -> {
+                    error.set(true);
+                    return Flux.empty();
+                })
                 .count()
-                .doOnError(e -> error.set(true))
                 .map(count -> EchoResponse.newBuilder()
-                        .setMessage(count + (error.get() ? "e" : ""))
+                        .setMessage(counter.get() + (error.get() ? "e" : ""))
                         .build());
     }
 
@@ -68,13 +71,18 @@ public Flux<EchoResponse> serverStreamEcho(RpcContext context, EchoRequest reque
     @Override
     public Flux<EchoResponse> mutualStreamEcho(RpcContext context, Publisher<EchoRequest> request) {
         return Flux.from(request)
-                .onErrorReturn(EchoRequest.newBuilder().setMessage("e").build())
                 .map(req -> {
                     LOGGER.info("got req {}", req.getMessage());
                     if ("e".equals(req.getMessage())) {
                         throw new RuntimeException("server error");
                     }
                     return EchoResponse.newBuilder().setMessage(req.getMessage()).build();
+                })
+                .onErrorResume(e -> {
+                    if (e.getMessage() != null && e.getMessage().contains("client error")) {
+                        return Flux.just(EchoResponse.newBuilder().setMessage("e").build());
+                    }
+                    return Flux.error(e);
                 });
     }
 }

trpc-test/trpc-test-integration/src/integration-test/java/com/tencent/trpc/integration/test/transport/CodecIntegrationTest.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,
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 
 /**
@@ -39,7 +40,9 @@
  */
 @ActiveProfiles("codec")
 @SpringBootTest(classes = TrpcServerApplication.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class CodecIntegrationTest {
+
     @TRpcClient(id = "no-compress-client")
     private EchoAPI noCompressEchoAPI;
     @TRpcClient(id = "gzip-client")
@@ -92,23 +95,12 @@ public void snappyTest() {
         assertResponseOK(snappyEchoAPI, "greater_than_compress_min_bytes");
     }
 
-    /**
-     * Server-side non-exist compressor test, related configuration file:
-     * <code>application-codec-compressor-error.yml</code>
-     */
-    @Test
-    public void testNonExistServerSideCompressor() {
-        assertThrows(RuntimeException.class, () ->
-                SpringApplication.run(TrpcServerApplication.class, "--spring.profiles.active=codec-compressor-error"));
-    }
-
-    /**
-     * Client-side non-exist compressor test
-     */
     @Test
-    public void testNonExistClientSideCompressor() {
-        assertThrows(RuntimeException.class, () ->
-                TRpcProxy.getProxy("illegal-compressor-client", EchoAPI.class));
+    public void testNonExistClientCompressor() {
+        assertThrows(Exception.class, () -> {
+            TRpcProxy.getProxy("illegal-compressor-client", EchoAPI.class)
+                    .echo(new RpcClientContext(), EchoRequest.newBuilder().setMessage("test").build());
+        });
     }
 
     /**
@@ -183,23 +175,12 @@ public void testJsonClientToJpbServer() {
         assertResponseOK(jsonToJpbEchoAPI, "hello");
     }
 
-    /**
-     * Client-side non-exist serialization test
-     */
-    @Test
-    public void testNonExistClientSideSerialization() {
-        assertThrows(RuntimeException.class, () ->
-                TRpcProxy.getProxy("illegal-serialization-client", EchoAPI.class));
-    }
-
-    /**
-     * Server-side non-exist serialization test, related configuration file:
-     * <code>application-codec-serialization-error.yml</code>
-     */
     @Test
-    public void testNonExistServerSideSerialization() {
-        assertThrows(RuntimeException.class, () -> SpringApplication
-                .run(TrpcServerApplication.class, "--spring.profiles.active=codec-serialization-error"));
+    public void testNonExistClientSerial() {
+        assertThrows(Exception.class, () -> {
+            TRpcProxy.getProxy("illegal-serialization-client", EchoAPI.class)
+                    .echo(new RpcClientContext(), EchoRequest.newBuilder().setMessage("test").build());
+        });
     }
 
     /**
@@ -221,4 +202,4 @@ private void assertResponseOK(JpbEchoAPI echoAPI, String message) {
         EchoResponsePojo echoResponse = echoAPI.echo(new RpcClientContext(), echoRequest);
         assertEquals(message, echoResponse.getMessage());
     }
-}
+}

trpc-test/trpc-test-integration/src/integration-test/java/com/tencent/trpc/integration/test/transport/TransportIntegrationTest.java

@@ -11,8 +11,8 @@
 
 package com.tencent.trpc.integration.test.transport;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.tencent.trpc.core.rpc.RpcClientContext;
 import com.tencent.trpc.integration.test.TrpcServerApplication;
@@ -21,18 +21,15 @@
 import com.tencent.trpc.integration.test.stub.EchoService.EchoRequest;
 import com.tencent.trpc.integration.test.stub.EchoService.EchoResponse;
 import com.tencent.trpc.spring.annotation.TRpcClient;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
  * Transport related integration tests. Related configuration file: <code>application-transport.yml</code>
  */
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = TrpcServerApplication.class)
 @ActiveProfiles("transport")
 public class TransportIntegrationTest {