aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers
diff options
context:
space:
mode:
authorLibravatar Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7>2021-07-26 15:01:23 +0200
committerLibravatar Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7>2021-07-26 15:01:23 +0200
commit1527e27f36762a5e3a1cdbb84467f67322cb7cba (patch)
treec076fb8117180a15989535743bd3bab32db01c71 /Solvers
parentbetter progress logging in smoke tests (diff)
downloadVIATRA-Generator-1527e27f36762a5e3a1cdbb84467f67322cb7cba.tar.gz
VIATRA-Generator-1527e27f36762a5e3a1cdbb84467f67322cb7cba.tar.zst
VIATRA-Generator-1527e27f36762a5e3a1cdbb84467f67322cb7cba.zip
Smoketest refactor splitting fast and slow smoke tests
Diffstat (limited to 'Solvers')
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapUnitTests.java5
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/MapUnitTests.java5
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/TestPermuter.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/TestPermuter.java)2
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest1Mutable.java)13
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest2Commit.java)13
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest3MutableImmutableCompare.java)13
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest4Restore.java)13
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java5
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest6SharedCache.java5
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest7Multithread.java5
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/slow/SmokeTestSlow.java67
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/MapTestEnvironment.java (renamed from Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapTestEnvironment.java)19
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/PrimeTesting.java23
13 files changed, 155 insertions, 33 deletions
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapUnitTests.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapUnitTests.java
deleted file mode 100644
index f4137375..00000000
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapUnitTests.java
+++ /dev/null
@@ -1,5 +0,0 @@
1package org.eclipse.viatra.solver.data.map;
2
3public class MapUnitTests {
4
5}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/MapUnitTests.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/MapUnitTests.java
new file mode 100644
index 00000000..db68ae03
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/MapUnitTests.java
@@ -0,0 +1,5 @@
1package org.eclipse.viatra.solver.data.map.test;
2
3public class MapUnitTests {
4
5}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/TestPermuter.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/TestPermuter.java
index db97cdf5..d9e50508 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/TestPermuter.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/TestPermuter.java
@@ -1,4 +1,4 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.smoke;
2 2
3import static org.junit.Assert.assertTrue; 3import static org.junit.Assert.assertTrue;
4import static org.junit.jupiter.api.Assertions.assertEquals; 4import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest1Mutable.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java
index ecc189dc..a1d37241 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest1Mutable.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest1Mutable.java
@@ -1,18 +1,23 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2 2
3import static org.junit.Assert.fail; 3import static org.junit.Assert.fail;
4 4
5import java.util.Random; 5import java.util.Random;
6import java.util.stream.Stream; 6import java.util.stream.Stream;
7 7
8import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
9import org.eclipse.viatra.solver.data.map.VersionedMapStore;
10import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
8import 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;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
9import org.junit.jupiter.params.ParameterizedTest; 14import org.junit.jupiter.params.ParameterizedTest;
10import org.junit.jupiter.params.provider.Arguments; 15import org.junit.jupiter.params.provider.Arguments;
11import org.junit.jupiter.params.provider.MethodSource; 16import org.junit.jupiter.params.provider.MethodSource;
12 17
13public class SmokeTest1Mutable { 18public class SmokeTest1Mutable {
14 19
15 private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) { 20 public void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) {
16 String[] values = MapTestEnvironment.prepareValues(maxValue); 21 String[] values = MapTestEnvironment.prepareValues(maxValue);
17 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); 22 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
18 23
@@ -65,9 +70,9 @@ public class SmokeTest1Mutable {
65 runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash); 70 runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash);
66 } 71 }
67 72
68 private static Stream<Arguments> parametrizedSmoke(){ 73 public static Stream<Arguments> parametrizedSmoke(){
69 return TestPermuter.permutationWithSize( 74 return TestPermuter.permutationWithSize(
70 new Object[] {1000,32*32*32*32}, 75 new Object[] {1000},
71 new Object[] {3,32, 32*32, 32*32*32*32}, 76 new Object[] {3,32, 32*32, 32*32*32*32},
72 new Object[] {2,3}, 77 new Object[] {2,3},
73 new Object[] {1,2,3}, 78 new Object[] {1,2,3},
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest2Commit.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java
index 8255746a..18cb9f58 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest2Commit.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest2Commit.java
@@ -1,17 +1,22 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2 2
3import static org.junit.Assert.fail; 3import static org.junit.Assert.fail;
4 4
5import java.util.Random; 5import java.util.Random;
6import java.util.stream.Stream; 6import java.util.stream.Stream;
7 7
8import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
9import org.eclipse.viatra.solver.data.map.VersionedMapStore;
10import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
8import 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;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
9import org.junit.jupiter.params.ParameterizedTest; 14import org.junit.jupiter.params.ParameterizedTest;
10import org.junit.jupiter.params.provider.Arguments; 15import org.junit.jupiter.params.provider.Arguments;
11import org.junit.jupiter.params.provider.MethodSource; 16import org.junit.jupiter.params.provider.MethodSource;
12 17
13public class SmokeTest2Commit { 18public class SmokeTest2Commit {
14 private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) { 19 public void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) {
15 String[] values = MapTestEnvironment.prepareValues(maxValue); 20 String[] values = MapTestEnvironment.prepareValues(maxValue);
16 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); 21 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
17 22
@@ -70,9 +75,9 @@ public class SmokeTest2Commit {
70 runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 75 runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
71 } 76 }
72 77
73 private static Stream<Arguments> parametrizedSmoke(){ 78 public static Stream<Arguments> parametrizedSmoke(){
74 return TestPermuter.permutationWithSize( 79 return TestPermuter.permutationWithSize(
75 new Object[] {1000,32*32*32*32}, 80 new Object[] {1000},
76 new Object[] {3,32, 32*32}, 81 new Object[] {3,32, 32*32},
77 new Object[] {2,3}, 82 new Object[] {2,3},
78 new Object[] {1,10,100}, 83 new Object[] {1,10,100},
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest3MutableImmutableCompare.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java
index ad03566a..b8dce3f5 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest3MutableImmutableCompare.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest3MutableImmutableCompare.java
@@ -1,17 +1,22 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2 2
3import static org.junit.Assert.fail; 3import static org.junit.Assert.fail;
4 4
5import java.util.Random; 5import java.util.Random;
6import java.util.stream.Stream; 6import java.util.stream.Stream;
7 7
8import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
9import org.eclipse.viatra.solver.data.map.VersionedMapStore;
10import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
8import 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;
13import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
9import org.junit.jupiter.params.ParameterizedTest; 14import org.junit.jupiter.params.ParameterizedTest;
10import org.junit.jupiter.params.provider.Arguments; 15import org.junit.jupiter.params.provider.Arguments;
11import org.junit.jupiter.params.provider.MethodSource; 16import org.junit.jupiter.params.provider.MethodSource;
12 17
13public class SmokeTest3MutableImmutableCompare { 18public class SmokeTest3MutableImmutableCompare {
14 private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) { 19 public void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) {
15 String[] values = MapTestEnvironment.prepareValues(maxValue); 20 String[] values = MapTestEnvironment.prepareValues(maxValue);
16 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); 21 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
17 22
@@ -61,9 +66,9 @@ public class SmokeTest3MutableImmutableCompare {
61 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 66 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
62 } 67 }
63 68
64 private static Stream<Arguments> parametrizedSmoke(){ 69 public static Stream<Arguments> parametrizedSmoke(){
65 return TestPermuter.permutationWithSize( 70 return TestPermuter.permutationWithSize(
66 new Object[] {1000,32*32*32*32}, 71 new Object[] {1000},
67 new Object[] {3,32, 32*32}, 72 new Object[] {3,32, 32*32},
68 new Object[] {2,3}, 73 new Object[] {2,3},
69 new Object[] {1,10,100}, 74 new Object[] {1,10,100},
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest4Restore.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java
index f0b3e56e..e024700a 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest4Restore.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest4Restore.java
@@ -1,4 +1,4 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2 2
3import static org.junit.Assert.fail; 3import static org.junit.Assert.fail;
4 4
@@ -7,13 +7,18 @@ import java.util.Map;
7import java.util.Random; 7import java.util.Random;
8import java.util.stream.Stream; 8import java.util.stream.Stream;
9 9
10import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
11import org.eclipse.viatra.solver.data.map.VersionedMapStore;
12import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
10import 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;
15import org.eclipse.viatra.solver.data.map.test.support.MapTestEnvironment;
11import org.junit.jupiter.params.ParameterizedTest; 16import org.junit.jupiter.params.ParameterizedTest;
12import org.junit.jupiter.params.provider.Arguments; 17import org.junit.jupiter.params.provider.Arguments;
13import org.junit.jupiter.params.provider.MethodSource; 18import org.junit.jupiter.params.provider.MethodSource;
14 19
15public class SmokeTest4Restore { 20public class SmokeTest4Restore {
16 private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) { 21 public void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) {
17 String[] values = MapTestEnvironment.prepareValues(maxValue); 22 String[] values = MapTestEnvironment.prepareValues(maxValue);
18 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); 23 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
19 24
@@ -86,9 +91,9 @@ public class SmokeTest4Restore {
86 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash); 91 runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
87 } 92 }
88 93
89 private static Stream<Arguments> parametrizedSmoke(){ 94 public static Stream<Arguments> parametrizedSmoke(){
90 return TestPermuter.permutationWithSize( 95 return TestPermuter.permutationWithSize(
91 new Object[] {1000,32*32*32*32}, 96 new Object[] {1000},
92 new Object[] {3,32, 32*32}, 97 new Object[] {3,32, 32*32},
93 new Object[] {2,3}, 98 new Object[] {2,3},
94 new Object[] {1,10,100}, 99 new Object[] {1,10,100},
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
new file mode 100644
index 00000000..d25b6303
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest5DiffCursor.java
@@ -0,0 +1,5 @@
1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2
3public class SmokeTest5DiffCursor {
4
5}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest6SharedCache.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest6SharedCache.java
new file mode 100644
index 00000000..6cae74e0
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest6SharedCache.java
@@ -0,0 +1,5 @@
1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2
3public class SmokeTest6SharedCache {
4
5}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest7Multithread.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest7Multithread.java
new file mode 100644
index 00000000..591c1361
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/fast/SmokeTest7Multithread.java
@@ -0,0 +1,5 @@
1package org.eclipse.viatra.solver.data.map.test.smoke.fast;
2
3public class SmokeTest7Multithread {
4
5}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/slow/SmokeTestSlow.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/slow/SmokeTestSlow.java
new file mode 100644
index 00000000..936c0e8d
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/smoke/slow/SmokeTestSlow.java
@@ -0,0 +1,67 @@
1package org.eclipse.viatra.solver.data.map.test.smoke.slow;
2
3import java.util.Arrays;
4import java.util.stream.Stream;
5
6import org.eclipse.viatra.solver.data.map.test.smoke.TestPermuter;
7import org.eclipse.viatra.solver.data.map.test.smoke.fast.SmokeTest1Mutable;
8import org.eclipse.viatra.solver.data.map.test.smoke.fast.SmokeTest2Commit;
9import org.eclipse.viatra.solver.data.map.test.smoke.fast.SmokeTest3MutableImmutableCompare;
10import org.eclipse.viatra.solver.data.map.test.smoke.fast.SmokeTest4Restore;
11import org.junit.jupiter.params.ParameterizedTest;
12import org.junit.jupiter.params.provider.Arguments;
13import org.junit.jupiter.params.provider.MethodSource;
14
15public class SmokeTestSlow {
16
17 private static int slowStepCount = 32*32*32*32;
18 private static Stream<Arguments> changeStepCount(Stream<Arguments> arguments) {
19 return arguments.map(x -> Arguments.of(updatedStepCount(x.get())));
20
21 }
22 private static Object[] updatedStepCount(Object[] arguments) {
23 Object[] copy = Arrays.copyOf(arguments,arguments.length);
24 copy[1]=slowStepCount;
25 return copy;
26 }
27
28 @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}")
29 @MethodSource
30 void smoke1(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) {
31 (new SmokeTest1Mutable()).runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash);
32 }
33
34 private static Stream<Arguments> smoke1(){
35 return changeStepCount(SmokeTest1Mutable.parametrizedSmoke());
36 }
37
38 @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
39 @MethodSource
40 void smoke2(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
41 (new SmokeTest2Commit()).runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
42 }
43
44 private static Stream<Arguments> smoke2(){
45 return changeStepCount(SmokeTest2Commit.parametrizedSmoke());
46 }
47
48 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
49 @MethodSource
50 void smoke3(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
51 (new SmokeTest3MutableImmutableCompare()).runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
52 }
53
54 private static Stream<Arguments> smoke3(){
55 return changeStepCount(SmokeTest3MutableImmutableCompare.parametrizedSmoke());
56 }
57
58 @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
59 @MethodSource
60 void smoke4(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
61 (new SmokeTest4Restore()).runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
62 }
63
64 private static Stream<Arguments> smoke4(){
65 return changeStepCount(SmokeTest4Restore.parametrizedSmoke());
66 }
67}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapTestEnvironment.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/MapTestEnvironment.java
index e53dc9f9..ba1d0cff 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/MapTestEnvironment.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/MapTestEnvironment.java
@@ -1,4 +1,4 @@
1package org.eclipse.viatra.solver.data.map; 1package org.eclipse.viatra.solver.data.map.test.support;
2 2
3import static org.junit.Assert.assertTrue; 3import static org.junit.Assert.assertTrue;
4import static org.junit.Assert.fail; 4import static org.junit.Assert.fail;
@@ -10,6 +10,8 @@ import java.util.Map;
10import java.util.Map.Entry; 10import java.util.Map.Entry;
11import java.util.TreeMap; 11import java.util.TreeMap;
12 12
13import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
14import org.eclipse.viatra.solver.data.map.Cursor;
13import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 15import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
14 16
15public class MapTestEnvironment<KEY,VALUE> { 17public class MapTestEnvironment<KEY,VALUE> {
@@ -39,16 +41,11 @@ public class MapTestEnvironment<KEY,VALUE> {
39 41
40 return result; 42 return result;
41 } 43 }
42
43 @Override
44 public boolean equals(Integer key1, Integer key2) {
45 return key1.equals(key2);
46 }
47 }; 44 };
48 return chp; 45 return chp;
49 } 46 }
50 47
51 public static <KEY, VALUE> void compareTwoMaps(VersionedMapImpl<KEY, VALUE> map1, VersionedMapImpl<KEY, VALUE> map2) { 48 public static <KEY, VALUE> void compareTwoMaps(String title, VersionedMapImpl<KEY, VALUE> map1, VersionedMapImpl<KEY, VALUE> map2) {
52 //1. Comparing cursors. 49 //1. Comparing cursors.
53 Cursor<KEY, VALUE> cursor1 = map1.getCursor(); 50 Cursor<KEY, VALUE> cursor1 = map1.getCursor();
54 Cursor<KEY, VALUE> cursor2 = map2.getCursor(); 51 Cursor<KEY, VALUE> cursor2 = map2.getCursor();
@@ -64,12 +61,12 @@ public class MapTestEnvironment<KEY,VALUE> {
64 if(!cursor2.isTerminated()) fail("cursor 1 terminated before cursor 2"); 61 if(!cursor2.isTerminated()) fail("cursor 1 terminated before cursor 2");
65 62
66 // 2.1. comparing hash codes 63 // 2.1. comparing hash codes
67 assertEquals(map1.hashCode(), map2.hashCode()); 64 assertEquals(map1.hashCode(), map2.hashCode(), title+": hash code check");
68 assertTrue(map1.equals(map2)); 65 assertTrue(title+": 1.equals(2)", map1.equals(map2));
69 assertTrue(map2.equals(map1)); 66 assertTrue(title+": 2.equals(1)", map2.equals(map1));
70 } 67 }
71 68
72 VersionedMapImpl<KEY, VALUE> sut; 69 public VersionedMapImpl<KEY, VALUE> sut;
73 Map<KEY,VALUE> oracle = new HashMap<KEY, VALUE>(); 70 Map<KEY,VALUE> oracle = new HashMap<KEY, VALUE>();
74 71
75 public MapTestEnvironment(VersionedMapImpl<KEY, VALUE> sut) { 72 public MapTestEnvironment(VersionedMapImpl<KEY, VALUE> sut) {
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/PrimeTesting.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/PrimeTesting.java
new file mode 100644
index 00000000..e5717f3a
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/test/support/PrimeTesting.java
@@ -0,0 +1,23 @@
1package org.eclipse.viatra.solver.data.map.test.support;
2
3public class PrimeTesting {
4
5 public static void main(String[] args) {
6 int max = 2;
7 for(int i=2147482647; i<Integer.MAX_VALUE; i++) {
8 if(isPrime(i) ) {
9 max = i;
10 System.out.println(max);
11 }
12 }
13 System.out.println(max);
14 }
15 private static boolean isPrime(int x) {
16 for(int tester = 2; tester < Math.sqrt(x); tester++) {
17 if(x%tester == 0) {
18 return false;
19 }
20 }
21 return true;
22 }
23}