Feat/optimize test

.github/workflows/pull_request.yml

@@ -9,7 +9,8 @@
 name: Pull Request Test
 
 on:
-  pull_request_target:
+  pull_request:
+    branches: [ "JDK17/Springboot3" ]
 
 jobs:
   test:

.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-core/pom.xml

@@ -262,44 +262,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>@{surefireArgLine}
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.io=ALL-UNNAMED
+                    </argLine>
                     <testFailureIgnore>${maven.ignore.testfailure}</testFailureIgnore>
                     <skipTests>false</skipTests>
-                    <systemPropertyVariables>
-                        <jacoco-agent.destfile>${project.build.directory}/coverage.exec
-                        </jacoco-agent.destfile>
-                    </systemPropertyVariables>
                     <reportsDirectory>../site/junit</reportsDirectory>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-instrument</id>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-restore-instrumented-classes</id>
-                        <goals>
-                            <goal>restore-instrumented-classes</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/coverage.exec</dataFile>
-                            <outputDirectory>../site/${project.artifactId}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

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

@@ -84,7 +84,7 @@
         <guava.version>32.1.3-jre</guava.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpclient5.version>5.4.1</httpclient5.version>
-        <httpcore5.version>5.4</httpcore5.version>
+        <httpcore5.version>5.3.1</httpcore5.version>
         <httpcore.version>4.4.15</httpcore.version>
         <hutool.all.version>5.8.28</hutool.all.version>
         <jackson.version>2.18.2</jackson.version>
@@ -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-maven-plugin/pom.xml

@@ -15,9 +15,10 @@
     <packaging>maven-plugin</packaging>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <maven.version>3.8.1</maven.version>
+        <maven.version>3.9.6</maven.version>
+        <maven-plugin-annotations.version>3.9.0</maven-plugin-annotations.version>
+        <maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
+        <maven-plugin-testing-harness.version>3.5.0</maven-plugin-testing-harness.version>
     </properties>
 
     <dependencies>
@@ -29,30 +30,52 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
             <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.4</version>
+            <version>${maven-plugin-annotations.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>
+            <version>${maven-plugin-testing-harness.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,7 +100,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.4</version>
+                <version>${maven-plugin-plugin.version}</version>
             </plugin>
         </plugins>
     </build>

trpc-maven-plugin/src/test/java/com/tencent/trpc/maven/plugin/TRpcMavenPluginTest.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,
@@ -24,6 +24,11 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.repository.RepositorySystem;
+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 java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -34,77 +39,81 @@
  */
 public class TRpcMavenPluginTest extends AbstractMojoTestCase {
 
-    @Override
-    protected void setUp() throws Exception {
+    @BeforeEach
+    public void setUp() throws Exception {
         super.setUp();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @AfterEach
+    public void tearDown() throws Exception {
         super.tearDown();
     }
 
     /**
      * Simulate 'mvn trpc:gen-code' on maven project at src/test/resources/TEST-1.
      * Only check the output files structure, since file content is checked by test cases of trpc-code-generator
      */
+    @Test
     public void test1() throws Exception {
         executeTest("TEST-1");
         Path base = Paths.get("src", "test", "resources", "TEST-1", "target", "generated-sources",
                 "trpc", "java").toAbsolutePath();
         Path output = base.resolve(Paths.get("com", "tencent", "test", "helloworld"));
-        assertTrue(Files.exists(output));
-        assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
-        assertTrue(Files.exists(base.resolve("pom.xml")));
+        Assertions.assertTrue(Files.exists(output));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
+        Assertions.assertTrue(Files.exists(base.resolve("pom.xml")));
     }
 
     /**
      * Simulate 'mvn trpc:gen-code' on maven project at src/test/resources/TEST-2.
      */
+    @Test
     public void test2() throws Exception {
         executeTest("TEST-2");
         Path base = Paths.get("src", "test", "resources", "TEST-2", "gen").toAbsolutePath();
         Path output = base.resolve(Paths.get("com", "tencent", "test", "helloworld"));
-        assertTrue(Files.exists(output));
-        assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
-        assertFalse(Files.exists(base.resolve("pom.xml")));
+        Assertions.assertTrue(Files.exists(output));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
+        Assertions.assertFalse(Files.exists(base.resolve("pom.xml")));
     }
 
     /**
      * Simulate 'mvn trpc:gen-code' on maven project at src/test/resources/TEST-3.
      */
+    @Test
     public void test3() throws Exception {
         executeTest("TEST-3");
         Path base = Paths.get("src", "test", "resources", "TEST-3", "target", "generated-sources",
                 "trpc", "java").toAbsolutePath();
         Path output = base.resolve(Paths.get("com", "tencent", "test", "helloworld"));
-        assertTrue(Files.exists(output));
-        assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
-        assertTrue(Files.exists(output.resolve("GreeterTest.java")));
-        assertEquals("Greeter foobar", new String(Files.readAllBytes(output.resolve("GreeterTest.java"))));
-        assertTrue(Files.exists(base.resolve("pom.xml")));
+        Assertions.assertTrue(Files.exists(output));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterTest.java")));
+        Assertions.assertEquals("Greeter foobar", new String(Files.readAllBytes(output.resolve("GreeterTest.java"))));
+        Assertions.assertTrue(Files.exists(base.resolve("pom.xml")));
     }
 
     /**
      * Simulate 'mvn trpc:gen-code' on maven project at src/test/resources/TEST-4.
      */
+    @Test
     public void test4() throws Exception {
         executeTest("TEST-4");
         Path base = Paths.get("src", "test", "resources", "TEST-4", "target", "generated-sources",
                 "trpc", "java").toAbsolutePath();
         Path output = base.resolve(Paths.get("com", "tencent", "test", "helloworld"));
-        assertTrue(Files.exists(output));
-        assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
-        assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
-        assertTrue(Files.exists(output.resolve("GreeterSvrValidator.java")));
-        assertTrue(Files.exists(base.resolve("pom.xml")));
+        Assertions.assertTrue(Files.exists(output));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterAsyncAPI.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterSvr.java")));
+        Assertions.assertTrue(Files.exists(output.resolve("GreeterSvrValidator.java")));
+        Assertions.assertTrue(Files.exists(base.resolve("pom.xml")));
     }
 
     private void executeTest(String root) throws Exception {
@@ -124,7 +133,7 @@ private MavenProject readMavenProject(File basedir) throws Exception {
         ProjectBuildingRequest configuration = request.getProjectBuildingRequest();
         configuration.setLocalRepository(createLocalArtifactRepository());
         MavenProject project = lookup(ProjectBuilder.class).build(pom, configuration).getProject();
-        assertNotNull(project);
+        Assertions.assertNotNull(project);
         return project;
     }
 

trpc-selector/trpc-selector-consul/src/test/java/com/tencent/trpc/selector/consul/ConsulSelectorTest.java

@@ -19,7 +19,7 @@
 import com.tencent.trpc.core.selector.loadbalance.support.RandomLoadBalance;
 import com.tencent.trpc.registry.center.NotifyListener;
 import com.tencent.trpc.registry.center.RegistryCenter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConsulSelectorTest {
 
@@ -107,4 +107,4 @@ private static class MockRequest extends AbstractRequest {
     }
 
 
-}
+}

trpc-selector/trpc-selector-nacos/src/test/java/com/tencent/trpc/selector/nacos/NacosSelectorTest.java

@@ -19,7 +19,7 @@
 import com.tencent.trpc.core.selector.loadbalance.support.RandomLoadBalance;
 import com.tencent.trpc.registry.center.NotifyListener;
 import com.tencent.trpc.registry.center.RegistryCenter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Nacos selector test class
@@ -117,4 +117,4 @@ public boolean isAvailable() {
             return false;
         }
     };
-}
+}

trpc-selector/trpc-selector-open-polaris/src/test/java/com/tencent/trpc/filter/polaris/PolarisClientFilterTest.java

@@ -1,7 +1,7 @@
 package com.tencent.trpc.filter.polaris;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tencent.polaris.metadata.core.MessageMetadataContainer;
@@ -23,14 +23,16 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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 org.mockito.InjectMocks;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.management.*"})
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class PolarisClientFilterTest {
 
     private static final String TEST_KEY = "test_key";