aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers
diff options
context:
space:
mode:
authorLibravatar Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7>2021-07-28 18:58:22 +0200
committerLibravatar Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7>2021-07-28 18:58:22 +0200
commite4acb8cf191436550cc80ac10d63c3eee1f89b5a (patch)
tree82d8000e92cf8e592eb26faf779d24f577692620 /Solvers
parentUpdated cursor interface, removed inefficient iterator interface. (diff)
downloadVIATRA-Generator-e4acb8cf191436550cc80ac10d63c3eee1f89b5a.tar.gz
VIATRA-Generator-e4acb8cf191436550cc80ac10d63c3eee1f89b5a.tar.zst
VIATRA-Generator-e4acb8cf191436550cc80ac10d63c3eee1f89b5a.zip
Adding timeout to tests
Diffstat (limited to 'Solvers')
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java2
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java2
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java2
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java2
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java2
5 files changed, 10 insertions, 0 deletions
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java
index 3011f0a0..86ccafb7 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java
@@ -11,6 +11,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter; 12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment; 13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
14import org.junit.jupiter.api.Timeout;
14import org.junit.jupiter.params.ParameterizedTest; 15import org.junit.jupiter.params.ParameterizedTest;
15import org.junit.jupiter.params.provider.Arguments; 16import org.junit.jupiter.params.provider.Arguments;
16import org.junit.jupiter.params.provider.MethodSource; 17import org.junit.jupiter.params.provider.MethodSource;
@@ -66,6 +67,7 @@ public class SmokeTest1Mutable {
66 67
67 @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}") 68 @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}")
68 @MethodSource 69 @MethodSource
70 @Timeout(value = 10)
69 void parametrizedSmoke(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) { 71 void parametrizedSmoke(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) {
70 runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash); 72 runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash);
71 } 73 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java
index d4876557..4e6520a1 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java
@@ -11,6 +11,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter; 12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment; 13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
14import org.junit.jupiter.api.Timeout;
14import org.junit.jupiter.params.ParameterizedTest; 15import org.junit.jupiter.params.ParameterizedTest;
15import org.junit.jupiter.params.provider.Arguments; 16import org.junit.jupiter.params.provider.Arguments;
16import org.junit.jupiter.params.provider.MethodSource; 17import org.junit.jupiter.params.provider.MethodSource;
@@ -71,6 +72,7 @@ public class SmokeTest2Commit {
71 72
72 @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") 73 @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
73 @MethodSource 74 @MethodSource
75 @Timeout(value = 10)
74 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) { 76 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
75 runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 77 runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
76 } 78 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java
index b78da792..d31ff069 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java
@@ -11,6 +11,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 11import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter; 12import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment; 13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
14import org.junit.jupiter.api.Timeout;
14import org.junit.jupiter.params.ParameterizedTest; 15import org.junit.jupiter.params.ParameterizedTest;
15import org.junit.jupiter.params.provider.Arguments; 16import org.junit.jupiter.params.provider.Arguments;
16import org.junit.jupiter.params.provider.MethodSource; 17import org.junit.jupiter.params.provider.MethodSource;
@@ -62,6 +63,7 @@ public class SmokeTest3MutableImmutableCompare {
62 63
63 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") 64 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
64 @MethodSource 65 @MethodSource
66 @Timeout(value = 10)
65 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) { 67 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
66 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 68 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
67 } 69 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java
index ceea84d5..b376c266 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java
@@ -13,6 +13,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
13import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 13import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
14import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter; 14import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
15import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment; 15import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
16import org.junit.jupiter.api.Timeout;
16import org.junit.jupiter.params.ParameterizedTest; 17import org.junit.jupiter.params.ParameterizedTest;
17import org.junit.jupiter.params.provider.Arguments; 18import org.junit.jupiter.params.provider.Arguments;
18import org.junit.jupiter.params.provider.MethodSource; 19import org.junit.jupiter.params.provider.MethodSource;
@@ -87,6 +88,7 @@ public class SmokeTest4Restore {
87 88
88 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") 89 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
89 @MethodSource 90 @MethodSource
91 @Timeout(value = 10)
90 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) { 92 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
91 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 93 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
92 } 94 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java
index 94324e96..ced3ad08 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java
@@ -12,6 +12,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
12import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 12import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
13import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter; 13import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
14import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment; 14import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
15import org.junit.jupiter.api.Timeout;
15import org.junit.jupiter.params.ParameterizedTest; 16import org.junit.jupiter.params.ParameterizedTest;
16import org.junit.jupiter.params.provider.Arguments; 17import org.junit.jupiter.params.provider.Arguments;
17import org.junit.jupiter.params.provider.MethodSource; 18import org.junit.jupiter.params.provider.MethodSource;
@@ -91,6 +92,7 @@ public class SmokeTest5DiffCursor {
91 92
92 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") 93 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
93 @MethodSource 94 @MethodSource
95 @Timeout(value = 10)
94 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) { 96 void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
95 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 97 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
96 } 98 }