Comparation tests between commiting and non-commiting maps.

4 files changed, 99 insertions, 2 deletions

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/MapTestEnvironment.java
index 11e1c1a7..e53dc9f9 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/MapTestEnvironment.java
@@ -1,6 +1,8 @@
 package org.eclipse.viatra.solver.data.map;
 
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -46,6 +48,27 @@ public class MapTestEnvironment<KEY,VALUE> {
                 return chp;
         }
         
+        public static <KEY, VALUE> void compareTwoMaps(VersionedMapImpl<KEY, VALUE> map1, VersionedMapImpl<KEY, VALUE> map2) {
+                //1. Comparing cursors.
+                Cursor<KEY, VALUE> cursor1 = map1.getCursor();
+                Cursor<KEY, VALUE> cursor2 = map2.getCursor();
+                while(!cursor1.isTerminated()) {
+                        if(cursor2.isTerminated()) {
+                                fail("cursor 2 terminated before cursor1");
+                        }
+                        assertEquals(cursor1.getKey(), cursor2.getKey());
+                        assertEquals(cursor2.getValue(), cursor2.getValue());
+                        cursor1.move();
+                        cursor2.move();
+                }
+                if(!cursor2.isTerminated()) fail("cursor 1 terminated before cursor 2");
+                
+                // 2.1. comparing hash codes
+                assertEquals(map1.hashCode(), map2.hashCode());
+                assertTrue(map1.equals(map2));
+                assertTrue(map2.equals(map1));
+        }
+        
         VersionedMapImpl<KEY, VALUE> sut;
         Map<KEY,VALUE> oracle = new HashMap<KEY, VALUE>();
         
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/SmokeTest1Mutable.java
index 4e6e46e3..e77d6468 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/SmokeTest1Mutable.java
@@ -59,7 +59,7 @@ public class SmokeTest1Mutable {
                 }
         }
         
-        @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4}, evil-hash={5}")
+        @ParameterizedTest(name = "Mutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}")
         @MethodSource
         void parametrizedSmoke(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) {
                 runSmokeTest("SmokeS"+steps+"K"+noKeys+"V"+noValues+"s"+seed+"H"+(evilHash?"Evil":"Normal"),seed,steps,noKeys,noValues,evilHash);
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/SmokeTest2Commit.java
index fa57f2d3..c9498381 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/SmokeTest2Commit.java
@@ -64,7 +64,7 @@ public class SmokeTest2Commit {
         }
         
         
-        @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5}")
+        @ParameterizedTest(name = "Immutable Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
         @MethodSource
         void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
                 runSmokeTest("SmokeCommitS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
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/SmokeTest3MutableImmutableCompare.java
new file mode 100644
index 00000000..d6fbf223
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/tests/org/eclipse/viatra/solver/data/map/SmokeTest3MutableImmutableCompare.java
@@ -0,0 +1,74 @@
+package org.eclipse.viatra.solver.data.map;
+
+import static org.junit.Assert.fail;
+
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class SmokeTest3MutableImmutableCompare {
+        private void runSmokeTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+                
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMapImpl<Integer, String> immutable = (VersionedMapImpl<Integer, String>) store.createMap();
+                VersionedMapImpl<Integer, String> mutable = (VersionedMapImpl<Integer, String>) store.createMap();
+                //MapTestEnvironment<Integer, String> e = new MapTestEnvironment<Integer, String>(sut);
+                
+                Random r = new Random(seed);
+                
+                iterativeRandomPutsAndCommits(scenario,immutable,mutable, steps, maxKey, values,  r, commitFrequency);
+        }
+        
+        void iterativeRandomPutsAndCommits(
+                String scenario,
+                VersionedMapImpl<Integer, String> immutable,
+                VersionedMapImpl<Integer, String> mutable,
+                int steps,
+                int maxKey,
+                String[] values,
+                Random r,
+                int commitFrequency)
+        {
+                for(int i=0; i<steps; i++) {
+                        int index = i+1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                immutable.put(nextKey, nextValue);
+                                mutable.put(nextKey,nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario+":"+index+": exception happened: "+exception);
+                        }
+                        if(index%commitFrequency == 0) {
+                                immutable.commit();
+                        }
+                        MapTestEnvironment.compareTwoMaps(immutable, mutable);
+                        
+                        if(index%10000==0) System.out.println(scenario+":"+index+" finished");
+                }
+        }
+        
+        @ParameterizedTest(name = "Mutable-Immutable Compare Smoke {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        void parametrizedSmoke(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed, boolean evilHash) {
+                runSmokeTest("SmokeMutableImmutableCompareS"+steps+"K"+noKeys+"V"+noValues+"s"+seed,seed,steps,noKeys,noValues,commitFrequency,evilHash);
+        }
+        
+        private static Stream<Arguments> parametrizedSmoke(){
+                return TestPermuter.permutationWithSize(
+                        new Object[] {1000,32*32*32*32},
+                        new Object[] {3,32, 32*32},
+                        new Object[] {2,3},
+                        new Object[] {1,10,100},
+                        new Object[] {1,2,3},
+                        new Object[] {false,true}
+                );
+        }
+}