Cleanup of TurtleTestsCategory

pibizza · Dec 20, 2024 · 8fd17ba · 8fd17ba
1 parent b8ceadc
commit 8fd17ba
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 56 deletions.
diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
@@ -37,7 +37,6 @@
 
   <properties>
     <java.module.name>org.drools.compiler</java.module.name>
-    <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
     <surefire.forkCount>2</surefire.forkCount>
     <drools.exclude.checkstyle>JavaParser.java|JavaLexer.java</drools.exclude.checkstyle>
   </properties>

diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
@@ -38,7 +38,6 @@
     <properties>
         <java.module.name>org.drools.mvel</java.module.name>
         <surefire.forkCount>2</surefire.forkCount>
-        <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
     </properties>
 
     <dependencies>

diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     <java.module.name>org.drools.compiler.integrationtests</java.module.name>
-    <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
     <surefire.forkCount>2</surefire.forkCount>
   </properties>
 

diff --git a/...r-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java b/...r-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java
@@ -20,17 +20,16 @@
 
 import org.drools.testcoverage.common.model.A;
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.io.ResourceType;
 import org.kie.api.runtime.KieSession;
 import org.kie.internal.conf.ParallelExecutionOption;
 import org.kie.internal.utils.KieHelper;
-import org.kie.test.testcategory.TurtleTestCategory;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -39,7 +38,7 @@
 
 import static org.assertj.core.api.Assertions.fail;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true")
 public class CompositeAgendaTest {
 
     @Test 

diff --git a/...-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java b/...-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java
@@ -34,17 +34,16 @@
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.KieBaseUtil;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true")
 public class QueryConcurrencyTest {
 
     private static int LOOP = 500;

diff --git a/...src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java b/...src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java
@@ -31,16 +31,16 @@
 import org.drools.testcoverage.common.util.TestParametersUtil2;
 import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true")
 public class SharedSessionParallelTest extends AbstractConcurrentTest {
 
     public static Stream<Arguments> parameters() {

diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml
@@ -35,7 +35,6 @@
 
     <properties>
         <java.module.name>org.drools.compiler.integrationtests</java.module.name>
-        <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
         <surefire.forkCount>2</surefire.forkCount>
     </properties>
 

diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml
@@ -35,7 +35,6 @@
 
     <properties>
         <java.module.name>org.drools.compiler.integrationtests</java.module.name>
-        <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
         <surefire.forkCount>2</surefire.forkCount>
     </properties>
 

diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml
@@ -35,7 +35,6 @@
 
     <properties>
         <java.module.name>org.drools.compiler.integrationtests</java.module.name>
-        <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
         <surefire.forkCount>2</surefire.forkCount>
     </properties>
 

diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml
@@ -37,7 +37,6 @@
 
   <properties>
     <java.module.name>org.drools.testcoverage.testsuite</java.module.name>
-    <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
   </properties>
 
   <dependencyManagement>

diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
@@ -36,7 +36,6 @@
 
   <properties>
     <java.module.name>org.kie.ci</java.module.name>
-    <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
   </properties>
 
   <dependencies>
@@ -160,11 +159,6 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-test-util</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -249,9 +243,23 @@
           <name>runTurtleTests</name>
         </property>
       </activation>
-      <properties>
-        <excludedGroups/>
-      </properties>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+		    <configuration>
+		        <systemProperties>
+		            <property>
+		                <name>runTurtleTests</name>
+		                <value>true</value>
+		            </property>
+		        </systemProperties>
+    		</configuration>            
+    		</plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
     </profile>
   </profiles>
 </project>
diff --git a/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java b/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java
@@ -25,23 +25,22 @@
 
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
 import org.drools.core.util.FileManager;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.kie.api.KieServices;
 import org.kie.api.builder.ReleaseId;
 import org.kie.scanner.AbstractKieCiTest;
 import org.kie.scanner.KieMavenRepository;
-import org.kie.test.testcategory.TurtleTestCategory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true")
 public class ConcurrentBuildTest extends AbstractKieCiTest {
     private static final Logger LOG = LoggerFactory.getLogger(ConcurrentBuildTest.class);
 
@@ -115,6 +114,6 @@ public void concurrentBuildWithDependency() throws Exception {
             KieServices.Factory.get().getRepository().removeKieModule(releaseIdDepA);
             KieServices.Factory.get().getRepository().removeKieModule(releaseIdDepB);
         }
-        assertTrue(true); // no deadlock
+        assertThat(true).isTrue(); // no deadlock
     }
 }
diff --git a/kie-test-util/src/main/java/org/kie/test/testcategory/TurtleTestCategory.java b/kie-test-util/src/main/java/org/kie/test/testcategory/TurtleTestCategory.java