Add tag for incremental tests.

ragconnect.tests/build.gradle

@@ -93,11 +93,13 @@ task allTests(type: Test, dependsOn: testClasses) {
 }
 
 task specificTest(type: Test, dependsOn: testClasses) {
-    description = 'Run test tagged with "NewTest"'
+    description = 'Run test tagged with tag given by "-PincludeTags="'
     group = 'verification'
+    String tags = project.hasProperty("includeTags") ?
+                   project.property("includeTags") : ''
 
     useJUnitPlatform {
-        includeTags 'SpecificTest'
+        includeTags tags
     }
 }
 
@@ -276,6 +278,7 @@ task compileIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/incremental/Test.relast'),
                       file('src/test/01-input/incremental/Test.connect')]
         rootNode = 'A'
+        logWrites = true
     }
     relast {
         useJastAddNames = true
@@ -343,6 +346,7 @@ task compileTreeIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/tree/Test.relast'),
                       file('src/test/01-input/tree/Test.connect')]
         rootNode = 'Root'
+        logWrites = true
     }
     relast {
         useJastAddNames = true
@@ -389,6 +393,7 @@ task compileTreeAllowedTokensIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/treeAllowedTokens/Test.relast'),
                       file('src/test/01-input/treeAllowedTokens/Test.connect')]
         rootNode = 'Root'
+        logWrites = true
     }
     relast {
         useJastAddNames = true

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java

@@ -3,6 +3,7 @@ package org.jastadd.ragconnect.tests;
 import incremental.ast.A;
 import incremental.ast.B;
 import incremental.ast.MqttHandler;
+import org.junit.jupiter.api.Tag;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Incremental")
 public class IncrementalDependencyTest extends AbstractMqttTest {
 
   private static final String TOPIC_IN = "in/a";

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java

@@ -86,7 +86,7 @@ public class TestUtils {
   }
 
   static void waitForMqtt() throws InterruptedException {
-    TimeUnit.SECONDS.sleep(2);
+    TimeUnit.MILLISECONDS.sleep(1500);
   }
 
   @SuppressWarnings({"unused", "rawtypes"})

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java

@@ -18,7 +18,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
-@Tag("SpecificTest")
+@Tag("Incremental")
+@Tag("Tree")
 public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensTest {
 
   private Root model;
@@ -42,6 +43,8 @@ public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensT
 
     receiverRoot = new ReceiverRoot();
     model.addReceiverRoot((ReceiverRoot) receiverRoot);
+
+    model.ragconnectCheckIncremental();
   }
 
   @Override

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java

 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import treeAllowedTokens.ast.*;
 
@@ -18,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
 public class TreeAllowedTokensManualTest extends AbstractTreeAllowedTokensTest {
 
   private Root model;

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java

 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import treeInc.ast.*;
 
@@ -17,6 +18,8 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
+@Tag("Incremental")
 public class TreeIncrementalTest extends AbstractTreeTest {
 
   private Root model;

ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java

 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import tree.ast.MqttHandler;
 import tree.ast.ReceiverRoot;
@@ -19,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
 public class TreeManualTest extends AbstractTreeTest {
 
   private Root model;