diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index cfa70e99f13..290f30c1b34 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -37,7 +37,6 @@ org.drools.compiler - org.kie.test.testcategory.TurtleTestCategory 2 JavaParser.java|JavaLexer.java diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml index 3bd052b2358..2e51764f607 100644 --- a/drools-mvel/pom.xml +++ b/drools-mvel/pom.xml @@ -38,7 +38,6 @@ org.drools.mvel 2 - org.kie.test.testcategory.TurtleTestCategory diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml index 9392bc80cb2..ba3594a265f 100644 --- a/drools-test-coverage/test-compiler-integration/pom.xml +++ b/drools-test-coverage/test-compiler-integration/pom.xml @@ -35,7 +35,6 @@ org.drools.compiler.integrationtests - org.kie.test.testcategory.TurtleTestCategory 2 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 fd05e83dabf..9e6c24bf38d 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 @@ -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/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 ef227dd4c74..4e54b18a0b2 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,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/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 23516200e9b..3e6f7cec016 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 @@ -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 parameters() { diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml index 09a4e65fba9..768e59c2279 100644 --- a/drools-test-coverage/test-integration-nomvel/pom.xml +++ b/drools-test-coverage/test-integration-nomvel/pom.xml @@ -35,7 +35,6 @@ org.drools.compiler.integrationtests - org.kie.test.testcategory.TurtleTestCategory 2 diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml index 8ca004d44f6..88dbf23f102 100644 --- a/drools-test-coverage/test-integration-notms/pom.xml +++ b/drools-test-coverage/test-integration-notms/pom.xml @@ -35,7 +35,6 @@ org.drools.compiler.integrationtests - org.kie.test.testcategory.TurtleTestCategory 2 diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml index 579873e9314..3a9ace807fe 100644 --- a/drools-test-coverage/test-integration-noxml/pom.xml +++ b/drools-test-coverage/test-integration-noxml/pom.xml @@ -35,7 +35,6 @@ org.drools.compiler.integrationtests - org.kie.test.testcategory.TurtleTestCategory 2 diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml index 9947867730f..e0bde11a53c 100644 --- a/drools-test-coverage/test-suite/pom.xml +++ b/drools-test-coverage/test-suite/pom.xml @@ -37,7 +37,6 @@ org.drools.testcoverage.testsuite - org.kie.test.testcategory.TurtleTestCategory diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml index 3aee239da18..368b9566a8a 100644 --- a/kie-ci/pom.xml +++ b/kie-ci/pom.xml @@ -36,7 +36,6 @@ org.kie.ci - org.kie.test.testcategory.TurtleTestCategory @@ -160,11 +159,6 @@ assertj-core test - - org.kie - kie-test-util - test - @@ -249,9 +243,23 @@ 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 0b49f0707ec..676cd4645da 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 @@ -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 } } \ No newline at end of file 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 deleted file mode 100644 index a5f4f46685e..00000000000 --- a/kie-test-util/src/main/java/org/kie/test/testcategory/TurtleTestCategory.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.kie.test.testcategory; - -/** - * Serves as a JUnit's {@link org.junit.experimental.categories.Category} to mark turtle tests (tests which are slow - * and should not be executed by default). These slow tests can be then enabled by defining property `runTurtleTests` - */ -public class TurtleTestCategory { - -}