From f6fdc9b5076a3bd76d32bc2cbf2f9976e14c583d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E4=B8=99?=
 <10604541+sanbing-os@user.noreply.gitee.com>
Date: Wed, 9 Oct 2024 12:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djunit5=E5=8D=95=E4=BE=A7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cache/RedisCacheConfigurationIT.java      |  2 ++
 .../resources/app-service-test.properties     |  1 +
 pom.xml                                       | 25 +++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java
index edd93f6..ae5640e 100644
--- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java
+++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java
@@ -7,6 +7,7 @@ package sanbing.jcpp.infrastructure.cache;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.springframework.data.redis.core.*;
 import sanbing.jcpp.AbstractTestBase;
 
@@ -16,6 +17,7 @@ import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.IntStream;
 
+@EnabledIfSystemProperty(named = "cache.type", matches = "redis")
 class RedisCacheConfigurationIT extends AbstractTestBase {
 
     @Resource
diff --git a/jcpp-app-bootstrap/src/test/resources/app-service-test.properties b/jcpp-app-bootstrap/src/test/resources/app-service-test.properties
index 9e61ffc..b397d7b 100644
--- a/jcpp-app-bootstrap/src/test/resources/app-service-test.properties
+++ b/jcpp-app-bootstrap/src/test/resources/app-service-test.properties
@@ -1,2 +1,3 @@
 redis.connection.type=cluster
 redis.cluster.nodes=10.102.12.101:30700,10.102.12.101:32027,10.102.12.101:30767,10.102.12.101:30250,10.102.12.101:30612,10.102.12.101:32303
+service.protocols.yunkuaichongV150.listener.tcp.bind-port=0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bd91b22..37e6903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,8 @@
         <guava.version>33.3.0-jre</guava.version>
         <jacoco.version>0.8.12</jacoco.version>
         <itCoverageAgent/>
+        <skip.unit.tests/>
+        <skip.integration.tests/>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <disruptor.version>3.4.4</disruptor.version>
         <protobuf.version>3.21.9</protobuf.version>
@@ -52,18 +54,18 @@
     </properties>
 
     <profiles>
-        <!-- Unit test only -->
+        <!-- 默认不运行测试用例 -->
         <profile>
             <id>dev</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <skip.unit.test>true</skip.unit.test>
-                <skip.integration.test>true</skip.integration.test>
+                <skip.unit.tests>true</skip.unit.tests>
+                <skip.integration.tests>true</skip.integration.tests>
             </properties>
         </profile>
-        <!-- Unit test only -->
+        <!-- 只运行单侧 -->
         <profile>
             <id>unit-test</id>
             <properties>
@@ -71,7 +73,7 @@
                 <skip.integration.tests>true</skip.integration.tests>
             </properties>
         </profile>
-        <!-- Integration test only -->
+        <!-- 只运行集测 -->
         <profile>
             <id>integration-test</id>
             <properties>
@@ -79,7 +81,7 @@
                 <skip.integration.tests>false</skip.integration.tests>
             </properties>
         </profile>
-        <!-- Unit and Integration tests combined -->
+        <!-- 同时运行单侧和集测 -->
         <profile>
             <id>test-all</id>
             <properties>
@@ -368,7 +370,7 @@
                         -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
                         --add-opens java.base/java.lang.reflect=ALL-UNNAMED
                     </argLine>
-                    <skipTests>${skip.unit.test}</skipTests>
+                    <skipTests>${skip.unit.tests}</skipTests>
                     <forkCount>1</forkCount>
                     <runOrder>filesystem</runOrder>
                     <includes>
@@ -392,11 +394,19 @@
                         <artifactId>surefire-junit47</artifactId>
                         <version>${maven-surefire-plugin.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skip.integration.tests}</skipTests>
+                </configuration>
                 <executions>
                     <execution>
                         <id>integration-tests</id>
@@ -405,7 +415,6 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <skipTests>${skip.integration.test}</skipTests>
                             <includes>
                                 <include>**/*IntegrationTest.java</include>
                                 <include>**/IT*.java</include>