diff options
author | 2021-08-06 21:01:21 +0200 | |
---|---|---|
committer | 2021-08-06 21:01:21 +0200 | |
commit | 949270faa90457e798472144e0f9c041979cda03 (patch) | |
tree | 585ae39fd3db7257e65d997e1cbe3757fec049f2 | |
parent | Renamed Smoke tests to Fuzz tests (diff) | |
download | refinery-949270faa90457e798472144e0f9c041979cda03.tar.gz refinery-949270faa90457e798472144e0f9c041979cda03.tar.zst refinery-949270faa90457e798472144e0f9c041979cda03.zip |
More smoke -> fuzz
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitFuzzTest.java) | 28 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsFuzzTest.java) | 28 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorFuzzTest.java) | 28 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableFuzzTest.java) | 32 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareFuzzTest.java) | 28 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreFuzzTest.java) | 24 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreFuzzTest.java) | 24 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtils.java) | 2 | ||||
-rw-r--r-- | model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java (renamed from model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtilsTest.java) | 2 |
9 files changed, 105 insertions, 91 deletions
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java index 7bd024a4..e160df2b 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | |||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
12 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
14 | import org.junit.jupiter.api.Tag; | 14 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 15 | import org.junit.jupiter.api.Timeout; |
@@ -18,7 +18,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
18 | import org.junit.jupiter.params.provider.MethodSource; | 18 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 19 | ||
20 | class CommitFuzzTest { | 20 | class CommitFuzzTest { |
21 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 21 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
22 | boolean evilHash) { | 22 | boolean evilHash) { |
23 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 23 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
24 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 24 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -63,33 +63,33 @@ class CommitFuzzTest { | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 66 | @ParameterizedTest(name = "Commit {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
67 | @MethodSource | 67 | @MethodSource |
68 | @Timeout(value = 10) | 68 | @Timeout(value = 10) |
69 | @Tag("smoke") | 69 | @Tag("fuzz") |
70 | void parametrizedFastSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 70 | void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
71 | boolean evilHash) { | 71 | boolean evilHash) { |
72 | runSmokeTest("SmokeCommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 72 | runFuzzTest("CommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
73 | commitFrequency, evilHash); | 73 | commitFrequency, evilHash); |
74 | } | 74 | } |
75 | 75 | ||
76 | static Stream<Arguments> parametrizedFastSmoke() { | 76 | static Stream<Arguments> parametrizedFastFuzz() { |
77 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 77 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
78 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 78 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
79 | new Object[] { false, true }); | 79 | new Object[] { false, true }); |
80 | } | 80 | } |
81 | 81 | ||
82 | @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 82 | @ParameterizedTest(name = "Commit {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
83 | @MethodSource | 83 | @MethodSource |
84 | @Tag("smoke") | 84 | @Tag("fuzz") |
85 | @Tag("slow") | 85 | @Tag("slow") |
86 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 86 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
87 | boolean evilHash) { | 87 | boolean evilHash) { |
88 | runSmokeTest("SmokeCommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 88 | runFuzzTest("CommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
89 | commitFrequency, evilHash); | 89 | commitFrequency, evilHash); |
90 | } | 90 | } |
91 | 91 | ||
92 | static Stream<Arguments> parametrizedSlowSmoke() { | 92 | static Stream<Arguments> parametrizedSlowFuzz() { |
93 | return FuzzTestUtils.changeStepCount(parametrizedFastSmoke(), 1); | 93 | return FuzzTestUtils.changeStepCount(parametrizedFastFuzz(), 1); |
94 | } | 94 | } |
95 | } | 95 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java index 11e393d4..f7d3d548 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.fail; | 4 | import static org.junit.jupiter.api.Assertions.fail; |
@@ -16,7 +16,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMap; | |||
16 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 16 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
17 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 17 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
18 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 18 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
19 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 19 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
20 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 20 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
21 | import org.junit.jupiter.api.Tag; | 21 | import org.junit.jupiter.api.Tag; |
22 | import org.junit.jupiter.api.Timeout; | 22 | import org.junit.jupiter.api.Timeout; |
@@ -25,7 +25,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
25 | import org.junit.jupiter.params.provider.MethodSource; | 25 | import org.junit.jupiter.params.provider.MethodSource; |
26 | 26 | ||
27 | class ContentEqualsFuzzTest { | 27 | class ContentEqualsFuzzTest { |
28 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 28 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
29 | boolean evilHash) { | 29 | boolean evilHash) { |
30 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 30 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
31 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 31 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -110,33 +110,33 @@ class ContentEqualsFuzzTest { | |||
110 | assertEquals(sut1, sut2, "Maps are not equals"); | 110 | assertEquals(sut1, sut2, "Maps are not equals"); |
111 | } | 111 | } |
112 | 112 | ||
113 | @ParameterizedTest(name = "Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 113 | @ParameterizedTest(name = "Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
114 | @MethodSource | 114 | @MethodSource |
115 | @Timeout(value = 10) | 115 | @Timeout(value = 10) |
116 | @Tag("smoke") | 116 | @Tag("fuzz") |
117 | void parametrizedFastSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 117 | void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
118 | boolean evilHash) { | 118 | boolean evilHash) { |
119 | runSmokeTest("SmokeCommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 119 | runFuzzTest("CompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
120 | commitFrequency, evilHash); | 120 | commitFrequency, evilHash); |
121 | } | 121 | } |
122 | 122 | ||
123 | static Stream<Arguments> parametrizedFastSmoke() { | 123 | static Stream<Arguments> parametrizedFastFuzz() { |
124 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 124 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
125 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 125 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
126 | new Object[] { false, true }); | 126 | new Object[] { false, true }); |
127 | } | 127 | } |
128 | 128 | ||
129 | @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 129 | @ParameterizedTest(name = "Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
130 | @MethodSource | 130 | @MethodSource |
131 | @Tag("smoke") | 131 | @Tag("fuzz") |
132 | @Tag("slow") | 132 | @Tag("slow") |
133 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 133 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
134 | boolean evilHash) { | 134 | boolean evilHash) { |
135 | runSmokeTest("SmokeCommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 135 | runFuzzTest("CompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
136 | commitFrequency, evilHash); | 136 | commitFrequency, evilHash); |
137 | } | 137 | } |
138 | 138 | ||
139 | static Stream<Arguments> parametrizedSlowSmoke() { | 139 | static Stream<Arguments> parametrizedSlowFuzz() { |
140 | return FuzzTestUtils.changeStepCount(parametrizedFastSmoke(), 1); | 140 | return FuzzTestUtils.changeStepCount(parametrizedFastFuzz(), 1); |
141 | } | 141 | } |
142 | } | 142 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java index ae1c49ff..4b79a98a 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -10,7 +10,7 @@ import org.eclipse.viatra.solver.data.map.DiffCursor; | |||
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 10 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 11 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
12 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 12 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
13 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 13 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
14 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 14 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
15 | import org.junit.jupiter.api.Tag; | 15 | import org.junit.jupiter.api.Tag; |
16 | import org.junit.jupiter.api.Timeout; | 16 | import org.junit.jupiter.api.Timeout; |
@@ -19,7 +19,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
19 | import org.junit.jupiter.params.provider.MethodSource; | 19 | import org.junit.jupiter.params.provider.MethodSource; |
20 | 20 | ||
21 | class DiffCursorFuzzTest { | 21 | class DiffCursorFuzzTest { |
22 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
23 | boolean evilHash) { | 23 | boolean evilHash) { |
24 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 24 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
25 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 25 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -85,32 +85,32 @@ class DiffCursorFuzzTest { | |||
85 | 85 | ||
86 | } | 86 | } |
87 | 87 | ||
88 | @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 88 | @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
89 | @MethodSource | 89 | @MethodSource |
90 | @Timeout(value = 10) | 90 | @Timeout(value = 10) |
91 | @Tag("smoke") | 91 | @Tag("fuzz") |
92 | void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 92 | void parametrizedFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
93 | boolean evilHash) { | 93 | boolean evilHash) { |
94 | runSmokeTest("SmokeMutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, | 94 | runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, |
95 | noKeys, noValues, commitFrequency, evilHash); | 95 | noKeys, noValues, commitFrequency, evilHash); |
96 | } | 96 | } |
97 | 97 | ||
98 | static Stream<Arguments> parametrizedSmoke() { | 98 | static Stream<Arguments> parametrizedFuzz() { |
99 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 99 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
100 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 100 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
101 | new Object[] { false, true }); | 101 | new Object[] { false, true }); |
102 | } | 102 | } |
103 | @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 103 | @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
104 | @MethodSource | 104 | @MethodSource |
105 | @Tag("smoke") | 105 | @Tag("fuzz") |
106 | @Tag("slow") | 106 | @Tag("slow") |
107 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 107 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
108 | boolean evilHash) { | 108 | boolean evilHash) { |
109 | runSmokeTest("SmokeCommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 109 | runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
110 | commitFrequency, evilHash); | 110 | commitFrequency, evilHash); |
111 | } | 111 | } |
112 | 112 | ||
113 | static Stream<Arguments> parametrizedSlowSmoke() { | 113 | static Stream<Arguments> parametrizedSlowFuzz() { |
114 | return FuzzTestUtils.changeStepCount(parametrizedSmoke(), 1); | 114 | return FuzzTestUtils.changeStepCount(parametrizedFuzz(), 1); |
115 | } | 115 | } |
116 | } | 116 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java index 13ef1eb6..2d589dc9 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | |||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
12 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
14 | import org.junit.jupiter.api.Tag; | 14 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 15 | import org.junit.jupiter.api.Timeout; |
@@ -18,7 +18,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
18 | import org.junit.jupiter.params.provider.MethodSource; | 18 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 19 | ||
20 | class MutableFuzzTest { | 20 | class MutableFuzzTest { |
21 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) { | 21 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) { |
22 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 22 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
23 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 23 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
24 | 24 | ||
@@ -59,19 +59,33 @@ class MutableFuzzTest { | |||
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}") | 62 | @ParameterizedTest(name = "Mutable {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}") |
63 | @MethodSource | 63 | @MethodSource |
64 | @Timeout(value = 10) | 64 | @Timeout(value = 10) |
65 | @Tag("smoke") | 65 | @Tag("fuzz") |
66 | void parametrizedSmoke(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) { | 66 | void parametrizedFuzz(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) { |
67 | runSmokeTest( | 67 | runFuzzTest( |
68 | "SmokeS" + steps + "K" + noKeys + "V" + noValues + "s" + seed + "H" + (evilHash ? "Evil" : "Normal"), | 68 | "MutableS" + steps + "K" + noKeys + "V" + noValues + "s" + seed + "H" + (evilHash ? "Evil" : "Normal"), |
69 | seed, steps, noKeys, noValues, evilHash); | 69 | seed, steps, noKeys, noValues, evilHash); |
70 | } | 70 | } |
71 | 71 | ||
72 | static Stream<Arguments> parametrizedSmoke() { | 72 | static Stream<Arguments> parametrizedFuzz() { |
73 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, | 73 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, |
74 | new Object[] { 3, 32, 32 * 32, 32 * 32 * 32 * 32 }, new Object[] { 2, 3 }, new Object[] { 1, 2, 3 }, | 74 | new Object[] { 3, 32, 32 * 32, 32 * 32 * 32 * 32 }, new Object[] { 2, 3 }, new Object[] { 1, 2, 3 }, |
75 | new Object[] { false, true }); | 75 | new Object[] { false, true }); |
76 | } | 76 | } |
77 | |||
78 | @ParameterizedTest(name = "Mutable {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}") | ||
79 | @MethodSource | ||
80 | @Tag("fuzz") | ||
81 | @Tag("slow") | ||
82 | void parametrizedSlowFuzz(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) { | ||
83 | runFuzzTest( | ||
84 | "MutableS" + steps + "K" + noKeys + "V" + noValues + "s" + seed + "H" + (evilHash ? "Evil" : "Normal"), | ||
85 | seed, steps, noKeys, noValues, evilHash); | ||
86 | } | ||
87 | |||
88 | static Stream<Arguments> parametrizedSlowFuzz() { | ||
89 | return FuzzTestUtils.changeStepCount(parametrizedFuzz(), 1); | ||
90 | } | ||
77 | } | 91 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java index 77d55d5a..cc2abfe4 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | |||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
12 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
14 | import org.junit.jupiter.api.Tag; | 14 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 15 | import org.junit.jupiter.api.Timeout; |
@@ -18,7 +18,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
18 | import org.junit.jupiter.params.provider.MethodSource; | 18 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 19 | ||
20 | class MutableImmutableCompareFuzzTest { | 20 | class MutableImmutableCompareFuzzTest { |
21 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 21 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
22 | boolean evilHash) { | 22 | boolean evilHash) { |
23 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 23 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
24 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 24 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -56,33 +56,33 @@ class MutableImmutableCompareFuzzTest { | |||
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 59 | @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
60 | @MethodSource | 60 | @MethodSource |
61 | @Timeout(value = 10) | 61 | @Timeout(value = 10) |
62 | @Tag("smoke") | 62 | @Tag("fuzz") |
63 | void parametrizedFastSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 63 | void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
64 | boolean evilHash) { | 64 | boolean evilHash) { |
65 | runSmokeTest("SmokeMutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, | 65 | runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, |
66 | noKeys, noValues, commitFrequency, evilHash); | 66 | noKeys, noValues, commitFrequency, evilHash); |
67 | } | 67 | } |
68 | 68 | ||
69 | static Stream<Arguments> parametrizedFastSmoke() { | 69 | static Stream<Arguments> parametrizedFastFuzz() { |
70 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 70 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
71 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 71 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
72 | new Object[] { false, true }); | 72 | new Object[] { false, true }); |
73 | } | 73 | } |
74 | 74 | ||
75 | @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 75 | @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
76 | @MethodSource | 76 | @MethodSource |
77 | @Tag("smoke") | 77 | @Tag("fuzz") |
78 | @Tag("slow") | 78 | @Tag("slow") |
79 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 79 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
80 | boolean evilHash) { | 80 | boolean evilHash) { |
81 | runSmokeTest("SmokeMutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, | 81 | runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, |
82 | noKeys, noValues, commitFrequency, evilHash); | 82 | noKeys, noValues, commitFrequency, evilHash); |
83 | } | 83 | } |
84 | 84 | ||
85 | static Stream<Arguments> parametrizedSlowSmoke() { | 85 | static Stream<Arguments> parametrizedSlowFuzz() { |
86 | return FuzzTestUtils.changeStepCount(MutableImmutableCompareFuzzTest.parametrizedFastSmoke(), 1); | 86 | return FuzzTestUtils.changeStepCount(MutableImmutableCompareFuzzTest.parametrizedFastFuzz(), 1); |
87 | } | 87 | } |
88 | } | 88 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java index 5ce5734b..7d9f5372 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -11,7 +11,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | |||
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
14 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 14 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
16 | import org.junit.jupiter.api.Tag; | 16 | import org.junit.jupiter.api.Tag; |
17 | import org.junit.jupiter.api.Timeout; | 17 | import org.junit.jupiter.api.Timeout; |
@@ -20,7 +20,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
20 | import org.junit.jupiter.params.provider.MethodSource; | 20 | import org.junit.jupiter.params.provider.MethodSource; |
21 | 21 | ||
22 | class RestoreFuzzTest { | 22 | class RestoreFuzzTest { |
23 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 23 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
24 | boolean evilHash) { | 24 | boolean evilHash) { |
25 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 25 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
26 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 26 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -76,33 +76,33 @@ class RestoreFuzzTest { | |||
76 | 76 | ||
77 | } | 77 | } |
78 | 78 | ||
79 | @ParameterizedTest(name = "Restore Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 79 | @ParameterizedTest(name = "Restore {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
80 | @MethodSource | 80 | @MethodSource |
81 | @Timeout(value = 10) | 81 | @Timeout(value = 10) |
82 | @Tag("smoke") | 82 | @Tag("smoke") |
83 | void parametrizedFastSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 83 | void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
84 | boolean evilHash) { | 84 | boolean evilHash) { |
85 | runSmokeTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 85 | runFuzzTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
86 | commitFrequency, evilHash); | 86 | commitFrequency, evilHash); |
87 | } | 87 | } |
88 | 88 | ||
89 | static Stream<Arguments> parametrizedFastSmoke() { | 89 | static Stream<Arguments> parametrizedFastFuzz() { |
90 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 90 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
91 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 91 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
92 | new Object[] { false, true }); | 92 | new Object[] { false, true }); |
93 | } | 93 | } |
94 | 94 | ||
95 | @ParameterizedTest(name = "Restore Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 95 | @ParameterizedTest(name = "Restore {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
96 | @MethodSource | 96 | @MethodSource |
97 | @Tag("smoke") | 97 | @Tag("smoke") |
98 | @Tag("slow") | 98 | @Tag("slow") |
99 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 99 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
100 | boolean evilHash) { | 100 | boolean evilHash) { |
101 | runSmokeTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 101 | runFuzzTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
102 | commitFrequency, evilHash); | 102 | commitFrequency, evilHash); |
103 | } | 103 | } |
104 | 104 | ||
105 | static Stream<Arguments> parametrizedSlowSmoke() { | 105 | static Stream<Arguments> parametrizedSlowFuzz() { |
106 | return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastSmoke(), 1); | 106 | return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastFuzz(), 1); |
107 | } | 107 | } |
108 | } | 108 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java index 0326ebfa..800308b4 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
@@ -11,7 +11,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | |||
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; |
12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; |
13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; |
14 | import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils; | 14 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; |
15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; |
16 | import org.junit.jupiter.api.Tag; | 16 | import org.junit.jupiter.api.Tag; |
17 | import org.junit.jupiter.api.Timeout; | 17 | import org.junit.jupiter.api.Timeout; |
@@ -20,7 +20,7 @@ import org.junit.jupiter.params.provider.Arguments; | |||
20 | import org.junit.jupiter.params.provider.MethodSource; | 20 | import org.junit.jupiter.params.provider.MethodSource; |
21 | 21 | ||
22 | class SharedStoreFuzzTest { | 22 | class SharedStoreFuzzTest { |
23 | private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 23 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
24 | boolean evilHash) { | 24 | boolean evilHash) { |
25 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 25 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
26 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); | 26 | ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash); |
@@ -80,33 +80,33 @@ class SharedStoreFuzzTest { | |||
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
83 | @ParameterizedTest(name = "Shared Store Test {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 83 | @ParameterizedTest(name = "Shared Store {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
84 | @MethodSource | 84 | @MethodSource |
85 | @Timeout(value = 10) | 85 | @Timeout(value = 10) |
86 | @Tag("smoke") | 86 | @Tag("smoke") |
87 | void parametrizedFastSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 87 | void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
88 | boolean evilHash) { | 88 | boolean evilHash) { |
89 | runSmokeTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 89 | runFuzzTest("SharedS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
90 | commitFrequency, evilHash); | 90 | commitFrequency, evilHash); |
91 | } | 91 | } |
92 | 92 | ||
93 | static Stream<Arguments> parametrizedFastSmoke() { | 93 | static Stream<Arguments> parametrizedFastFuzz() { |
94 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, | 94 | return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 }, |
95 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, | 95 | new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 }, |
96 | new Object[] { false, true }); | 96 | new Object[] { false, true }); |
97 | } | 97 | } |
98 | 98 | ||
99 | @ParameterizedTest(name = "Shared Store Test {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") | 99 | @ParameterizedTest(name = "Shared Store {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}") |
100 | @MethodSource | 100 | @MethodSource |
101 | @Tag("smoke") | 101 | @Tag("smoke") |
102 | @Tag("slow") | 102 | @Tag("slow") |
103 | void parametrizedSlowSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, | 103 | void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, |
104 | boolean evilHash) { | 104 | boolean evilHash) { |
105 | runSmokeTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, | 105 | runFuzzTest("SharedS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues, |
106 | commitFrequency, evilHash); | 106 | commitFrequency, evilHash); |
107 | } | 107 | } |
108 | 108 | ||
109 | static Stream<Arguments> parametrizedSlowSmoke() { | 109 | static Stream<Arguments> parametrizedSlowFuzz() { |
110 | return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastSmoke(), 1); | 110 | return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastFuzz(), 1); |
111 | } | 111 | } |
112 | } | 112 | } |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtils.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java index 1e85020a..ec21bb7b 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtils.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke.utils; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz.utils; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtilsTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java index e1b49dfd..3f4214bc 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtilsTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.smoke.utils; | 1 | package org.eclipse.viatra.solver.data.map.tests.fuzz.utils; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | 4 | ||