From 8a22e9d91c71aa653c5035179be64c000c94c90c Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Wed, 5 May 2021 18:17:48 +0200
Subject: [PATCH] Add tag for incremental tests.
---
ragconnect.tests/build.gradle | 9 +++++++--
.../ragconnect/tests/IncrementalDependencyTest.java | 2 ++
.../java/org/jastadd/ragconnect/tests/TestUtils.java | 2 +-
.../tests/TreeAllowedTokensIncrementalTest.java | 5 ++++-
.../ragconnect/tests/TreeAllowedTokensManualTest.java | 2 ++
.../jastadd/ragconnect/tests/TreeIncrementalTest.java | 3 +++
.../org/jastadd/ragconnect/tests/TreeManualTest.java | 2 ++
7 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ragconnect.tests/build.gradle b/ragconnect.tests/build.gradle
index 35fb227..37babe8 100644
--- a/ragconnect.tests/build.gradle
+++ b/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
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java
index 43fe8b3..60d099c 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java
+++ b/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";
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
index 776e7a0..2d08ccb 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
+++ b/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"})
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java
index 5dd1b15..8661608 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java
+++ b/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
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
index c3b91a0..99aacc3 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
@@ -1,5 +1,6 @@
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;
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
index e0d7c81..53ed825 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
@@ -1,5 +1,6 @@
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;
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
index 060317d..e15ba23 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
@@ -1,5 +1,6 @@
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;
--
GitLab