From 9bee9fd4f85902af9c85cf2ff0b16fa0778711c1 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Fri, 24 Jan 2025 17:32:26 +0100 Subject: [PATCH] Tagged turtle tests --- drools-compiler/pom.xml | 11 -------- .../test-compiler-integration/pom.xml | 25 ----------------- .../integrationtests/CompositeAgendaTest.java | 4 +-- .../QueryConcurrencyTest.java | 4 +-- .../AccumulateFunctionConcurrencyTest.java | 4 +-- .../ConsequenceConcurrencyTest.java | 4 +-- .../ConsequenceWithAndOrConcurrencyTest.java | 3 ++- .../ConstraintConcurrencyTest.java | 4 +-- .../ConstraintWithAndOrConcurrencyTest.java | 4 +-- ...traintWithAndOrJittingConcurrencyTest.java | 4 +-- .../concurrency/EvalConcurrencyTest.java | 4 +-- .../FromAccumulateConcurrencyTest.java | 4 +-- .../concurrency/GlobalConcurrencyTest.java | 4 +-- ...ELDateClassFieldReaderConcurrencyTest.java | 4 +-- ...NumberClassFieldReaderConcurrencyTest.java | 4 +-- ...ObjectClassFieldReaderConcurrencyTest.java | 4 +-- .../AddRemoveGenerated2RulesEval2Test.java | 4 +-- .../AddRemoveGenerated2RulesEvalTest.java | 4 +-- .../AddRemoveGenerated2RulesIntegerTest.java | 4 +-- ...dRemoveGenerated2RulesMapContainsTest.java | 4 +-- .../AddRemoveGenerated2RulesNotNotTest.java | 4 +-- .../AddRemoveGenerated2RulesNotTest.java | 4 +-- ...emoveGenerated2RulesStringIntegerTest.java | 4 +-- .../AddRemoveGenerated2RulesStringTest.java | 4 +-- .../AddRemoveRulesAddDeleteFactsTest.java | 4 +-- .../AddRemoveRulesAdvOperatorsTest.java | 4 +-- .../SharedSessionParallelTest.java | 5 ++-- drools-test-coverage/test-suite/pom.xml | 11 -------- kie-ci/pom.xml | 27 ------------------- .../concurrent/ConcurrentBuildTest.java | 7 +++-- 30 files changed, 53 insertions(+), 128 deletions(-) diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index 290f30c1b34..52f522bf6ba 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -213,17 +213,6 @@ - - runTurtleTests - - - runTurtleTests - - - - - - enableTestStatusListener diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml index ba3594a265f..bc335dfc5a9 100644 --- a/drools-test-coverage/test-compiler-integration/pom.xml +++ b/drools-test-coverage/test-compiler-integration/pom.xml @@ -177,31 +177,6 @@ - - runTurtleTests - - - runTurtleTests - - - - - - - maven-surefire-plugin - - - - runTurtleTests - true - - - - - - - - diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java index 9e6c24bf38d..0fc1f81e124 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CompositeAgendaTest.java @@ -21,9 +21,9 @@ import org.drools.testcoverage.common.model.A; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; 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; @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.fail; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class CompositeAgendaTest { @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java index 4e54b18a0b2..553732dd1c5 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/QueryConcurrencyTest.java @@ -34,8 +34,8 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.TestParametersUtil2; +import org.junit.jupiter.api.Tag; 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; @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class QueryConcurrencyTest { private static int LOOP = 500; diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java index e11058d9acc..3d1403c59d4 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java @@ -22,9 +22,9 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AccumulateFunctionConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java index 6b4b23949e4..a739d7d8eeb 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java @@ -24,10 +24,10 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConsequenceConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java index d86435873c8..bbdf554bdee 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java @@ -24,11 +24,12 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConsequenceWithAndOrConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java index 34b503661f3..446fdecdf49 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java @@ -22,9 +22,9 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConstraintConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java index 6f1b3f35b1b..207dc7ffdd6 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java @@ -22,11 +22,11 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConstraintWithAndOrConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java index 868b4125132..ee30ef76fa4 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java @@ -22,11 +22,11 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConstraintWithAndOrJittingConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java index 9bb7e3310bf..3cd8708965a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java @@ -22,9 +22,9 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class EvalConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java index 9ce0178798b..7dcb8ec4dc7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java @@ -22,9 +22,9 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class FromAccumulateConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java index 6ca676fd7dc..5849b575351 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java @@ -30,7 +30,7 @@ import org.drools.testcoverage.common.model.Result; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.KieBase; @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class GlobalConcurrencyTest { private static final Logger LOGGER = LoggerFactory.getLogger(GlobalConcurrencyTest.class); diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java index fbb9fa29755..2e36aa06fe7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java @@ -23,10 +23,10 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class MVELDateClassFieldReaderConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java index d7ef9c33d0a..c75a1ffdbd7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java @@ -22,10 +22,10 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class MVELNumberClassFieldReaderConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java index 238604c0089..bcb0243b081 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java @@ -22,10 +22,10 @@ import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.kie.api.runtime.KieSession; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class MVELObjectClassFieldReaderConcurrencyTest extends BaseConcurrencyTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEval2Test.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEval2Test.java index 1ceb7879b92..c6803ca856d 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEval2Test.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEval2Test.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesEval2Test extends AbstractAddRemoveGenerated2RulesTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEvalTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEvalTest.java index d1192c98322..257f1c3a4a8 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEvalTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesEvalTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesEvalTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesIntegerTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesIntegerTest.java index 5e00162c86b..de678f42961 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesIntegerTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesIntegerTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesIntegerTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesMapContainsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesMapContainsTest.java index 0e51144ba31..b6e8fbaafc0 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesMapContainsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesMapContainsTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesMapContainsTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotNotTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotNotTest.java index d37c0914d77..281f3e3926a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotNotTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotNotTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesNotNotTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotTest.java index 9ea4d3676e1..ff8a273b770 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesNotTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringIntegerTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringIntegerTest.java index 5d6ccc96a7b..45b2d354f61 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringIntegerTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringIntegerTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesStringIntegerTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringTest.java index fc3517594fe..9f37a8ac0e8 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesStringTest.java @@ -20,9 +20,9 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveGenerated2RulesStringTest extends AbstractAddRemoveGenerated2RulesTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java index e0e53363829..e07c302af79 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.runtime.KieSession; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveRulesAddDeleteFactsTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java index 6c8fff14ea1..8b713077125 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java @@ -25,9 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.kie.api.runtime.KieSession; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,7 @@ /** * Tests adding and removing rules with advanced operators. */ -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class AddRemoveRulesAdvOperatorsTest { @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java index 3e6f7cec016..2e4cbdc3ff0 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java @@ -29,9 +29,8 @@ import org.drools.mvel.integrationtests.facts.BeanA; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil2; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; 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; @@ -40,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class SharedSessionParallelTest extends AbstractConcurrentTest { public static Stream parameters() { diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml index e0bde11a53c..2e1c318f7aa 100644 --- a/drools-test-coverage/test-suite/pom.xml +++ b/drools-test-coverage/test-suite/pom.xml @@ -181,17 +181,6 @@ - - runTurtleTests - - - runTurtleTests - - - - - - diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml index 368b9566a8a..f4e5e1baf55 100644 --- a/kie-ci/pom.xml +++ b/kie-ci/pom.xml @@ -235,31 +235,4 @@ - - - runTurtleTests - - - runTurtleTests - - - - - - - maven-surefire-plugin - - - - runTurtleTests - true - - - - - - - - - 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 index 676cd4645da..61746d841f4 100644 --- a/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java +++ b/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java @@ -27,9 +27,9 @@ import org.drools.core.util.FileManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; 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; @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.kie.scanner.KieMavenRepository.getKieMavenRepository; -@EnabledIfSystemProperty(named = "runTurtleTests", matches = "true") +@Tag("TurtleTests") public class ConcurrentBuildTest extends AbstractKieCiTest { private static final Logger LOG = LoggerFactory.getLogger(ConcurrentBuildTest.class); @@ -58,7 +58,6 @@ public void tearDown() throws Exception { this.fileManager.tearDown(); } - // This is TurtleTest. You can run this test with -PrunTurtleTests @Test @Timeout(600000) public void concurrentBuildWithDependency() throws Exception { @@ -116,4 +115,4 @@ public void concurrentBuildWithDependency() throws Exception { } assertThat(true).isTrue(); // no deadlock } -} \ No newline at end of file +}