Renamed Smoke tests to Fuzz tests

10 files changed, 56 insertions, 39 deletions

diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitFuzzTest.java
index ce526534..7bd024a4 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/CommitFuzzTest.java
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -17,7 +17,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class CommitSmokeTest {
+class CommitFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -74,7 +74,7 @@ class CommitSmokeTest {
         }
 
         static Stream<Arguments> parametrizedFastSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -90,6 +90,6 @@ class CommitSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(parametrizedFastSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(parametrizedFastSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsFuzzTest.java
index 2fe2a9a5..11e393d4 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/ContentEqualsFuzzTest.java
@@ -16,7 +16,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMap;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -24,7 +24,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class ContentEqualsSmokeTest {
+class ContentEqualsFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -121,7 +121,7 @@ class ContentEqualsSmokeTest {
         }
 
         static Stream<Arguments> parametrizedFastSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -137,6 +137,6 @@ class ContentEqualsSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(parametrizedFastSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(parametrizedFastSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorFuzzTest.java
index 5b530892..ae1c49ff 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/DiffCursorFuzzTest.java
@@ -10,7 +10,7 @@ import org.eclipse.viatra.solver.data.map.DiffCursor;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -18,7 +18,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class DiffCursorSmokeTest {
+class DiffCursorFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -96,7 +96,7 @@ class DiffCursorSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -111,6 +111,6 @@ class DiffCursorSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(parametrizedSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(parametrizedSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableFuzzTest.java
index b91e927c..13ef1eb6 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableFuzzTest.java
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -17,7 +17,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class MutableSmokeTest {
+class MutableFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
                 ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
@@ -70,7 +70,7 @@ class MutableSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT },
                                 new Object[] { 3, 32, 32 * 32, 32 * 32 * 32 * 32 }, new Object[] { 2, 3 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareFuzzTest.java
index 159a761c..77d55d5a 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/MutableImmutableCompareFuzzTest.java
@@ -9,7 +9,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -17,7 +17,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class MutableImmutableCompareSmokeTest {
+class MutableImmutableCompareFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -67,7 +67,7 @@ class MutableImmutableCompareSmokeTest {
         }
 
         static Stream<Arguments> parametrizedFastSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -83,6 +83,6 @@ class MutableImmutableCompareSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(MutableImmutableCompareSmokeTest.parametrizedFastSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(MutableImmutableCompareFuzzTest.parametrizedFastSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreSmokeTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreFuzzTest.java
index 0b06a6a9..5ce5734b 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreSmokeTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/RestoreFuzzTest.java
@@ -11,7 +11,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class RestoreSmokeTest {
+class RestoreFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -87,7 +87,7 @@ class RestoreSmokeTest {
         }
 
         static Stream<Arguments> parametrizedFastSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -103,6 +103,6 @@ class RestoreSmokeTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(RestoreSmokeTest.parametrizedFastSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreFuzzTest.java
index 44b30a29..0326ebfa 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/SharedStoreFuzzTest.java
@@ -11,7 +11,7 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.smoke.utils.SmokeTestUtils;
+import org.eclipse.viatra.solver.data.map.tests.smoke.utils.FuzzTestUtils;
 import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
@@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class SharedStoreTest {
+class SharedStoreFuzzTest {
         private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
@@ -91,7 +91,7 @@ public class SharedStoreTest {
         }
 
         static Stream<Arguments> parametrizedFastSmoke() {
-                return SmokeTestUtils.permutationWithSize(new Object[] { SmokeTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
                                 new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
                                 new Object[] { false, true });
         }
@@ -107,6 +107,6 @@ public class SharedStoreTest {
         }
 
         static Stream<Arguments> parametrizedSlowSmoke() {
-                return SmokeTestUtils.changeStepCount(RestoreSmokeTest.parametrizedFastSmoke(), 1);
+                return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastSmoke(), 1);
         }
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/SmokeTestUtils.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtils.java
index f85fb2c1..1e85020a 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/SmokeTestUtils.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtils.java
@@ -7,11 +7,11 @@ import java.util.stream.Stream;
 
 import org.junit.jupiter.params.provider.Arguments;
 
-public final class SmokeTestUtils {
+public final class FuzzTestUtils {
         public static final int FAST_STEP_COUNT = 500;
         public static final int SLOW_STEP_COUNT = 32 * 32 * 32 * 32;
 
-        private SmokeTestUtils() {
+        private FuzzTestUtils() {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
 
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/SmokeTestUtilsTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtilsTest.java
index 80a53a20..e1b49dfd 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/SmokeTestUtilsTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/smoke/utils/FuzzTestUtilsTest.java
@@ -6,24 +6,24 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-class SmokeTestUtilsTest {
+class FuzzTestUtilsTest {
         @Test
         void permutationInternalTest() {
-                List<List<Object>> res = SmokeTestUtils.permutationInternal(0, new Object[] { 1, 2, 3 },
+                List<List<Object>> res = FuzzTestUtils.permutationInternal(0, new Object[] { 1, 2, 3 },
                                 new Object[] { 'a', 'b', 'c' }, new Object[] { "alpha", "beta", "gamma", "delta" });
                 assertEquals(3 * 3 * 4, res.size());
         }
 
         @Test
         void permutationTest1() {
-                var res = SmokeTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
+                var res = FuzzTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
                                 new Object[] { "alpha", "beta", "gamma", "delta" });
                 assertEquals(3 * 3 * 4, res.count());
         }
 
         @Test
         void permutationTest2() {
-                var res = SmokeTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
+                var res = FuzzTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
                                 new Object[] { "alpha", "beta", "gamma", "delta" });
                 var arguments = res.findFirst().get().get();
                 assertEquals(1, arguments[0]);
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
index 8fd4bece..3f276481 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -54,9 +55,13 @@ public class MapTestEnvironment<K, V> {
                 }
 
         }
-
+        
         public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1,
                         VersionedMapImpl<K, V> map2) {
+                compareTwoMaps(title, map1, map2, null);
+        }
+        public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1,
+                        VersionedMapImpl<K, V> map2, List<Throwable> errors) {
                 // 1. Comparing cursors.
                 Cursor<K, V> cursor1 = map1.getCursor();
                 Cursor<K, V> cursor2 = map2.getCursor();
@@ -64,8 +69,8 @@ public class MapTestEnvironment<K, V> {
                         if (cursor2.isTerminated()) {
                                 fail("cursor 2 terminated before cursor1");
                         }
-                        assertEquals(cursor1.getKey(), cursor2.getKey());
-                        assertEquals(cursor2.getValue(), cursor2.getValue());
+                        assertEqualsList(cursor1.getKey(), cursor2.getKey(),"Keys not equal", errors);
+                        assertEqualsList(cursor2.getValue(), cursor2.getValue(), "Values not equal", errors);
                         cursor1.move();
                         cursor2.move();
                 }
@@ -73,9 +78,21 @@ public class MapTestEnvironment<K, V> {
                         fail("cursor 1 terminated before cursor 2");
 
                 // 2.1. comparing hash codes
-                assertEquals(map1.hashCode(), map2.hashCode(), title + ": hash code check");
-                assertEquals(map1, map2, title + ": 1.equals(2)");
-                assertEquals(map2, map1, title + ": 2.equals(1)");
+                assertEqualsList(map1.hashCode(), map2.hashCode(), title + ": hash code check",errors);
+                assertEqualsList(map1, map2, title + ": 1.equals(2)",errors);
+                assertEqualsList(map2, map1, title + ": 2.equals(1)",errors);
+        }
+        private static void assertEqualsList(Object o1, Object o2, String message, List<Throwable> errors) {
+                if(errors == null) {
+                        assertEquals(o1, o2, message);
+                } else {
+                        if(o1 != null) {
+                                if(!(o1.equals(o2))) {
+                                        AssertionError error = new AssertionError((message != null ? message+" " : "") + "expected: " + o1 + " but was : " + o2);
+                                        errors.add(error);
+                                }
+                        }
+                }
         }
 
         public VersionedMapImpl<K, V> sut;