修复junit5单侧问题

This commit is contained in:
三丙
2024-10-09 12:53:18 +08:00
parent fc6e73c5c4
commit f6fdc9b507
3 changed files with 20 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ package sanbing.jcpp.infrastructure.cache;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.data.redis.core.*; import org.springframework.data.redis.core.*;
import sanbing.jcpp.AbstractTestBase; import sanbing.jcpp.AbstractTestBase;
@@ -16,6 +17,7 @@ import java.util.Objects;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.stream.IntStream; import java.util.stream.IntStream;
@EnabledIfSystemProperty(named = "cache.type", matches = "redis")
class RedisCacheConfigurationIT extends AbstractTestBase { class RedisCacheConfigurationIT extends AbstractTestBase {
@Resource @Resource

View File

@@ -1,2 +1,3 @@
redis.connection.type=cluster 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 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

25
pom.xml
View File

@@ -36,6 +36,8 @@
<guava.version>33.3.0-jre</guava.version> <guava.version>33.3.0-jre</guava.version>
<jacoco.version>0.8.12</jacoco.version> <jacoco.version>0.8.12</jacoco.version>
<itCoverageAgent/> <itCoverageAgent/>
<skip.unit.tests/>
<skip.integration.tests/>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version> <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
<disruptor.version>3.4.4</disruptor.version> <disruptor.version>3.4.4</disruptor.version>
<protobuf.version>3.21.9</protobuf.version> <protobuf.version>3.21.9</protobuf.version>
@@ -52,18 +54,18 @@
</properties> </properties>
<profiles> <profiles>
<!-- Unit test only --> <!-- 默认不运行测试用例 -->
<profile> <profile>
<id>dev</id> <id>dev</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <properties>
<skip.unit.test>true</skip.unit.test> <skip.unit.tests>true</skip.unit.tests>
<skip.integration.test>true</skip.integration.test> <skip.integration.tests>true</skip.integration.tests>
</properties> </properties>
</profile> </profile>
<!-- Unit test only --> <!-- 只运行单侧 -->
<profile> <profile>
<id>unit-test</id> <id>unit-test</id>
<properties> <properties>
@@ -71,7 +73,7 @@
<skip.integration.tests>true</skip.integration.tests> <skip.integration.tests>true</skip.integration.tests>
</properties> </properties>
</profile> </profile>
<!-- Integration test only --> <!-- 只运行集测 -->
<profile> <profile>
<id>integration-test</id> <id>integration-test</id>
<properties> <properties>
@@ -79,7 +81,7 @@
<skip.integration.tests>false</skip.integration.tests> <skip.integration.tests>false</skip.integration.tests>
</properties> </properties>
</profile> </profile>
<!-- Unit and Integration tests combined --> <!-- 同时运行单侧和集测 -->
<profile> <profile>
<id>test-all</id> <id>test-all</id>
<properties> <properties>
@@ -368,7 +370,7 @@
-XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20 -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
</argLine> </argLine>
<skipTests>${skip.unit.test}</skipTests> <skipTests>${skip.unit.tests}</skipTests>
<forkCount>1</forkCount> <forkCount>1</forkCount>
<runOrder>filesystem</runOrder> <runOrder>filesystem</runOrder>
<includes> <includes>
@@ -392,11 +394,19 @@
<artifactId>surefire-junit47</artifactId> <artifactId>surefire-junit47</artifactId>
<version>${maven-surefire-plugin.version}</version> <version>${maven-surefire-plugin.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>${maven-surefire-plugin.version}</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipTests>${skip.integration.tests}</skipTests>
</configuration>
<executions> <executions>
<execution> <execution>
<id>integration-tests</id> <id>integration-tests</id>
@@ -405,7 +415,6 @@
<goal>verify</goal> <goal>verify</goal>
</goals> </goals>
<configuration> <configuration>
<skipTests>${skip.integration.test}</skipTests>
<includes> <includes>
<include>**/*IntegrationTest.java</include> <include>**/*IntegrationTest.java</include>
<include>**/IT*.java</include> <include>**/IT*.java</include>