Skip to content
Snippets Groups Projects
Commit 8a22e9d9 authored by René Schöne's avatar René Schöne
Browse files

Add tag for incremental tests.

parent 4fd92132
Branches
No related tags found
4 merge requests!39Version 1.1.0,!35Version 1.0.0,!17Version 0.3.2,!8Version 0.3.1
...@@ -93,11 +93,13 @@ task allTests(type: Test, dependsOn: testClasses) { ...@@ -93,11 +93,13 @@ task allTests(type: Test, dependsOn: testClasses) {
} }
task specificTest(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' group = 'verification'
String tags = project.hasProperty("includeTags") ?
project.property("includeTags") : ''
useJUnitPlatform { useJUnitPlatform {
includeTags 'SpecificTest' includeTags tags
} }
} }
...@@ -276,6 +278,7 @@ task compileIncremental(type: RagConnectTest) { ...@@ -276,6 +278,7 @@ task compileIncremental(type: RagConnectTest) {
inputFiles = [file('src/test/01-input/incremental/Test.relast'), inputFiles = [file('src/test/01-input/incremental/Test.relast'),
file('src/test/01-input/incremental/Test.connect')] file('src/test/01-input/incremental/Test.connect')]
rootNode = 'A' rootNode = 'A'
logWrites = true
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
...@@ -343,6 +346,7 @@ task compileTreeIncremental(type: RagConnectTest) { ...@@ -343,6 +346,7 @@ task compileTreeIncremental(type: RagConnectTest) {
inputFiles = [file('src/test/01-input/tree/Test.relast'), inputFiles = [file('src/test/01-input/tree/Test.relast'),
file('src/test/01-input/tree/Test.connect')] file('src/test/01-input/tree/Test.connect')]
rootNode = 'Root' rootNode = 'Root'
logWrites = true
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
...@@ -389,6 +393,7 @@ task compileTreeAllowedTokensIncremental(type: RagConnectTest) { ...@@ -389,6 +393,7 @@ task compileTreeAllowedTokensIncremental(type: RagConnectTest) {
inputFiles = [file('src/test/01-input/treeAllowedTokens/Test.relast'), inputFiles = [file('src/test/01-input/treeAllowedTokens/Test.relast'),
file('src/test/01-input/treeAllowedTokens/Test.connect')] file('src/test/01-input/treeAllowedTokens/Test.connect')]
rootNode = 'Root' rootNode = 'Root'
logWrites = true
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
......
...@@ -3,6 +3,7 @@ package org.jastadd.ragconnect.tests; ...@@ -3,6 +3,7 @@ package org.jastadd.ragconnect.tests;
import incremental.ast.A; import incremental.ast.A;
import incremental.ast.B; import incremental.ast.B;
import incremental.ast.MqttHandler; import incremental.ast.MqttHandler;
import org.junit.jupiter.api.Tag;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; ...@@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* *
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
@Tag("Incremental")
public class IncrementalDependencyTest extends AbstractMqttTest { public class IncrementalDependencyTest extends AbstractMqttTest {
private static final String TOPIC_IN = "in/a"; private static final String TOPIC_IN = "in/a";
......
...@@ -86,7 +86,7 @@ public class TestUtils { ...@@ -86,7 +86,7 @@ public class TestUtils {
} }
static void waitForMqtt() throws InterruptedException { static void waitForMqtt() throws InterruptedException {
TimeUnit.SECONDS.sleep(2); TimeUnit.MILLISECONDS.sleep(1500);
} }
@SuppressWarnings({"unused", "rawtypes"}) @SuppressWarnings({"unused", "rawtypes"})
......
...@@ -18,7 +18,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; ...@@ -18,7 +18,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* *
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
@Tag("SpecificTest") @Tag("Incremental")
@Tag("Tree")
public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensTest { public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensTest {
private Root model; private Root model;
...@@ -42,6 +43,8 @@ public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensT ...@@ -42,6 +43,8 @@ public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensT
receiverRoot = new ReceiverRoot(); receiverRoot = new ReceiverRoot();
model.addReceiverRoot((ReceiverRoot) receiverRoot); model.addReceiverRoot((ReceiverRoot) receiverRoot);
model.ragconnectCheckIncremental();
} }
@Override @Override
......
package org.jastadd.ragconnect.tests; package org.jastadd.ragconnect.tests;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import treeAllowedTokens.ast.*; import treeAllowedTokens.ast.*;
...@@ -18,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.*; ...@@ -18,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.*;
* *
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
@Tag("Tree")
public class TreeAllowedTokensManualTest extends AbstractTreeAllowedTokensTest { public class TreeAllowedTokensManualTest extends AbstractTreeAllowedTokensTest {
private Root model; private Root model;
......
package org.jastadd.ragconnect.tests; package org.jastadd.ragconnect.tests;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import treeInc.ast.*; import treeInc.ast.*;
...@@ -17,6 +18,8 @@ import static org.junit.jupiter.api.Assertions.*; ...@@ -17,6 +18,8 @@ import static org.junit.jupiter.api.Assertions.*;
* *
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
@Tag("Tree")
@Tag("Incremental")
public class TreeIncrementalTest extends AbstractTreeTest { public class TreeIncrementalTest extends AbstractTreeTest {
private Root model; private Root model;
......
package org.jastadd.ragconnect.tests; package org.jastadd.ragconnect.tests;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import tree.ast.MqttHandler; import tree.ast.MqttHandler;
import tree.ast.ReceiverRoot; import tree.ast.ReceiverRoot;
...@@ -19,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; ...@@ -19,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* *
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
@Tag("Tree")
public class TreeManualTest extends AbstractTreeTest { public class TreeManualTest extends AbstractTreeTest {
private Root model; private Root model;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment