DROOLS-2390 Fix all compilation errors in the migrated tests

drools-compiler/src/test/java/org/drools/compiler/integrationtests/KieContainerTest.java

@@ -24,6 +24,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.assertj.core.api.Assertions;
+import org.drools.compiler.CommonTestMethodBase;
 import org.drools.compiler.compiler.io.Folder;
 import org.drools.compiler.compiler.io.memory.MemoryFileSystem;
 import org.drools.core.impl.InternalKieContainer;
@@ -41,12 +42,11 @@
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 
-import static org.drools.compiler.integrationtests.incrementalcompilation.IncrementalCompilationTest.createAndDeployJar;
 import static org.drools.core.util.DroolsAssert.assertEnumerationSize;
 import static org.drools.core.util.DroolsAssert.assertUrlEnumerationContainsMatch;
 import static org.junit.Assert.*;
 
-public class KieContainerTest {
+public class KieContainerTest extends CommonTestMethodBase {
 
     @Test
     public void testMainKieModule() {

drools-compiler/src/test/java/org/drools/compiler/integrationtests/KieServicesTest.java

@@ -1,8 +1,8 @@
 package org.drools.compiler.integrationtests;
 
-import static org.drools.compiler.integrationtests.incrementalcompilation.IncrementalCompilationTest.createAndDeployJar;
 import static org.junit.Assert.*;
 
+import org.drools.compiler.CommonTestMethodBase;
 import org.drools.compiler.kie.builder.impl.KieContainerImpl;
 import org.drools.compiler.kie.builder.impl.KieServicesImpl;
 import org.junit.After;
@@ -12,7 +12,7 @@
 import org.kie.api.builder.ReleaseId;
 import org.kie.api.runtime.KieContainer;
 
-public class KieServicesTest {
+public class KieServicesTest extends CommonTestMethodBase {
 
 	private KieServices ks;
 

drools-test-coverage/test-compiler-integration/pom.xml

@@ -26,6 +26,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>test-compiler-integration</artifactId>
+  <name>Drools :: Test Coverage :: Compiler integration tests</name>
 
   <properties>
     <java.module.name>org.drools.compiler.integrationtests</java.module.name>
@@ -40,6 +41,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-compiler</artifactId>
@@ -50,12 +57,18 @@
       <artifactId>drools-model-compiler</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-test-util</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.drools.testcoverage</groupId>
+      <artifactId>drools-test-suite</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AbstractAddRemoveGenerated2RulesTest.java

@@ -8,17 +8,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.compiler.TurtleTestCategory;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.kie.test.testcategory.TurtleTestCategory;
 
 @Category(TurtleTestCategory.class)
 public abstract class AbstractAddRemoveGenerated2RulesTest {
 
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     private final String rule1;
     private final String rule2;
 
@@ -46,18 +42,19 @@ public AbstractAddRemoveGenerated2RulesTest(final ConstraintsPair constraintsPai
     // This takes only three different constraints - this is intentional, because it is needed to
     // keep the number of combinations at reasonable number.
     public static Collection<ConstraintsPair[]> generateRulesConstraintsCombinations(final String constraint1,
-            final String constraint2, final String constraint3) {
-        final Set<ConstraintsPair> constraintsPairs = new HashSet<ConstraintsPair>();
-        final List<ConstraintsPair[]> result = new ArrayList<ConstraintsPair[]>();
+                                                                                     final String constraint2,
+                                                                                     final String constraint3) {
+        final Set<ConstraintsPair> constraintsPairs = new HashSet<>();
+        final List<ConstraintsPair[]> result = new ArrayList<>();
 
-        final List<String> constraintsList = new ArrayList<String>();
+        final List<String> constraintsList = new ArrayList<>();
         constraintsList.add(constraint1);
         constraintsList.add(constraint2);
         constraintsList.add(constraint3);
         final List<String> constraintsCombinations = getConstraintsCombinations(constraintsList);
 
-        for (String constraintsRule1 : constraintsCombinations) {
-            for (String constraintsRule2 : constraintsCombinations) {
+        for (final String constraintsRule1 : constraintsCombinations) {
+            for (final String constraintsRule2 : constraintsCombinations) {
                 final ConstraintsPair constraintsPair = new ConstraintsPair(constraintsRule1, constraintsRule2);
                 if (constraintsPairs.add(constraintsPair)) {
                     result.add(new ConstraintsPair[]{constraintsPair});
@@ -68,10 +65,10 @@ public static Collection<ConstraintsPair[]> generateRulesConstraintsCombinations
     }
 
     private static List<String> getConstraintsCombinations(final List<String> constraintsList) {
-        final List<String> ruleConstraintsCombinations = new ArrayList<String>();
-        for (String constraint : constraintsList) {
-            for (String constraint2 : constraintsList) {
-                for (String constraint3 : constraintsList) {
+        final List<String> ruleConstraintsCombinations = new ArrayList<>();
+        for (final String constraint : constraintsList) {
+            for (final String constraint2 : constraintsList) {
+                for (final String constraint3 : constraintsList) {
                     ruleConstraintsCombinations.add(constraint.replace("${variableNamePlaceholder}", "$i")
                             + constraint2.replace("${variableNamePlaceholder}", "$j")
                             + constraint3.replace("${variableNamePlaceholder}", "$k"));
@@ -140,7 +137,7 @@ public void testInsertFactsFireRulesRemoveRulesReinsertRulesRevertedRules() {
     }
 
     private Object[] getFacts() {
-        final Map<Object, String> mapFact = new HashMap<Object, String>(1);
+        final Map<Object, String> mapFact = new HashMap<>(1);
         mapFact.put(new Object(), "1");
         return new Object[] {1, 2, 3, "1", mapFact};
     }

drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java

@@ -8,35 +8,35 @@
 import java.util.Set;
 
 import org.assertj.core.api.Assertions;
-import org.drools.compiler.TurtleTestCategory;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.FactHandle;
+import org.kie.test.testcategory.TurtleTestCategory;
 
 @Category(TurtleTestCategory.class)
 @RunWith(Parameterized.class)
 public class AddRemoveRulesAddDeleteFactsTest {
 
-    private StringPermutation rulesPermutation;
+    private final StringPermutation rulesPermutation;
 
     public AddRemoveRulesAddDeleteFactsTest(final StringPermutation rulesPermutation) {
         this.rulesPermutation = rulesPermutation;
     }
 
     @Parameterized.Parameters
     public static Collection<StringPermutation[]> getRulesPermutations() {
-        final Collection<StringPermutation[]> rulesPermutations = new HashSet<StringPermutation[]>();
+        final Collection<StringPermutation[]> rulesPermutations = new HashSet<>();
 
-        final Set<StringPermutation> parametersPermutations = new HashSet<StringPermutation>();
+        final Set<StringPermutation> parametersPermutations = new HashSet<>();
         getStringPermutations(
                 new String[]{TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME},
                 new String[]{},
                 parametersPermutations);
 
-        for (StringPermutation permutation : parametersPermutations) {
+        for (final StringPermutation permutation : parametersPermutations) {
             rulesPermutations.add(new StringPermutation[]{permutation});
         }
 
@@ -47,7 +47,7 @@ public static Collection<StringPermutation[]> getRulesPermutations() {
     public void testAddRemoveRulesAddRemoveFacts() {
         final KieSession kieSession = TestUtil.createSession(getRules());
         try {
-            final List resultsList = new ArrayList();
+            final List<String> resultsList = new ArrayList<>();
             kieSession.setGlobal("list", resultsList);
             final List<FactHandle> insertedFacts = TestUtil.insertFacts(kieSession, getFacts());
             kieSession.fireAllRules();

drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java

@@ -22,11 +22,11 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.assertj.core.api.Assertions;
-import org.drools.compiler.TurtleTestCategory;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.kie.api.runtime.KieSession;
+import org.kie.test.testcategory.TurtleTestCategory;
 
 /**
  * Tests adding and removing rules with advanced operators.
@@ -624,12 +624,12 @@ public void testAddRemoveRuleContainsExists3Rules() {
                 " list.add('" + TestUtil.RULE3_NAME + "'); \n" +
                 "end";
 
-        Map<Object, String> mapFact = new HashMap<Object, String>(1);
+        final Map<Object, String> mapFact = new HashMap<>(1);
         mapFact.put(new Object(), "1");
 
         final KieSession kieSession = TestUtil.createSession(rule1);
         try {
-            final List resultsList = new ArrayList();
+            final List<String> resultsList = new ArrayList<>();
             kieSession.setGlobal("list", resultsList);
             kieSession.setGlobal("globalInt", new AtomicInteger(0));
             TestUtil.insertFacts(kieSession, mapFact, 1, "1");
@@ -695,12 +695,12 @@ public void testAddRemoveRuleContainsExists3RulesDoubledExists() {
                 " list.add('" + TestUtil.RULE3_NAME + "'); \n" +
                 "end";
 
-        Map<Object, String> mapFact = new HashMap<Object, String>(1);
+        final Map<Object, String> mapFact = new HashMap<>(1);
         mapFact.put(new Object(), "1");
 
         final KieSession kieSession = TestUtil.createSession(rule1);
         try {
-            final List resultsList = new ArrayList();
+            final List<String> resultsList = new ArrayList<>();
             kieSession.setGlobal("list", resultsList);
             kieSession.setGlobal("globalInt", new AtomicInteger(0));
             TestUtil.insertFacts(kieSession, mapFact, 1, "1");
@@ -724,15 +724,15 @@ public void testAddRemoveRuleContainsExists3RulesDoubledExists() {
     }
 
     private Object[] getFactsContains() {
-        final Map<Object, String> mapFact = new HashMap<Object, String>(1);
+        final Map<Object, String> mapFact = new HashMap<>(1);
         mapFact.put(new Object(), "1");
 
         return new Object[]{mapFact, 1, 2, "1"};
     }
 
     private Map<String, Object> getGlobalsMemberOf(final String memberString) {
-        final Map<String, Object> globals = new HashMap<String, Object>(1);
-        final List<String> memberList = new ArrayList<String>(1);
+        final Map<String, Object> globals = new HashMap<>(1);
+        final List<String> memberList = new ArrayList<>(1);
         memberList.add(memberString);
         globals.put("memberList", memberList);
         return globals;