diff options
Diffstat (limited to 'model-data/src/test/java/org/eclipse/viatra/solver')
2 files changed, 8 insertions, 8 deletions
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java index f7d3d548..5004c152 100644 --- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java +++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java | |||
@@ -59,7 +59,7 @@ class ContentEqualsFuzzTest { | |||
59 | 59 | ||
60 | // Get the content of the first map | 60 | // Get the content of the first map |
61 | List<SimpleEntry<Integer, String>> content = new LinkedList<>(); | 61 | List<SimpleEntry<Integer, String>> content = new LinkedList<>(); |
62 | Cursor<Integer, String> cursor = sut1.getCursor(); | 62 | Cursor<Integer, String> cursor = sut1.getAll(); |
63 | while (cursor.move()) { | 63 | while (cursor.move()) { |
64 | content.add(new SimpleEntry<>(cursor.getKey(), cursor.getValue())); | 64 | content.add(new SimpleEntry<>(cursor.getKey(), cursor.getValue())); |
65 | } | 65 | } |
@@ -88,8 +88,8 @@ class ContentEqualsFuzzTest { | |||
88 | 88 | ||
89 | 89 | ||
90 | // By cursors | 90 | // By cursors |
91 | Cursor<Integer, String> cursor1 = sut1.getCursor(); | 91 | Cursor<Integer, String> cursor1 = sut1.getAll(); |
92 | Cursor<Integer, String> cursor2 = sut2.getCursor(); | 92 | Cursor<Integer, String> cursor2 = sut2.getAll(); |
93 | int index3 = 1; | 93 | int index3 = 1; |
94 | boolean canMove = true; | 94 | boolean canMove = true; |
95 | do{ | 95 | do{ |
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 3f276481..aaf9f50c 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 | |||
@@ -63,8 +63,8 @@ public class MapTestEnvironment<K, V> { | |||
63 | public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1, | 63 | public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1, |
64 | VersionedMapImpl<K, V> map2, List<Throwable> errors) { | 64 | VersionedMapImpl<K, V> map2, List<Throwable> errors) { |
65 | // 1. Comparing cursors. | 65 | // 1. Comparing cursors. |
66 | Cursor<K, V> cursor1 = map1.getCursor(); | 66 | Cursor<K, V> cursor1 = map1.getAll(); |
67 | Cursor<K, V> cursor2 = map2.getCursor(); | 67 | Cursor<K, V> cursor2 = map2.getAll(); |
68 | while (!cursor1.isTerminated()) { | 68 | while (!cursor1.isTerminated()) { |
69 | if (cursor2.isTerminated()) { | 69 | if (cursor2.isTerminated()) { |
70 | fail("cursor 2 terminated before cursor1"); | 70 | fail("cursor 2 terminated before cursor1"); |
@@ -136,7 +136,7 @@ public class MapTestEnvironment<K, V> { | |||
136 | // <key,value> pair. | 136 | // <key,value> pair. |
137 | // Tests iterators | 137 | // Tests iterators |
138 | int elementsInSutEntrySet = 0; | 138 | int elementsInSutEntrySet = 0; |
139 | Cursor<K, V> cursor = sut.getCursor(); | 139 | Cursor<K, V> cursor = sut.getAll(); |
140 | while (cursor.move()) { | 140 | while (cursor.move()) { |
141 | elementsInSutEntrySet++; | 141 | elementsInSutEntrySet++; |
142 | K key = cursor.getKey(); | 142 | K key = cursor.getKey(); |
@@ -164,7 +164,7 @@ public class MapTestEnvironment<K, V> { | |||
164 | 164 | ||
165 | public static <K,V> void checkOrder(String scenario, VersionedMap<K,V> versionedMap) { | 165 | public static <K,V> void checkOrder(String scenario, VersionedMap<K,V> versionedMap) { |
166 | K previous = null; | 166 | K previous = null; |
167 | Cursor<K, V> cursor = versionedMap.getCursor(); | 167 | Cursor<K, V> cursor = versionedMap.getAll(); |
168 | while(cursor.move()) { | 168 | while(cursor.move()) { |
169 | System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().getHash(cursor.getKey(), 0)); | 169 | System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().getHash(cursor.getKey(), 0)); |
170 | if(previous != null) { | 170 | if(previous != null) { |
@@ -178,7 +178,7 @@ public class MapTestEnvironment<K, V> { | |||
178 | 178 | ||
179 | public void printComparison() { | 179 | public void printComparison() { |
180 | System.out.println("SUT:"); | 180 | System.out.println("SUT:"); |
181 | printEntrySet(sut.getCursor()); | 181 | printEntrySet(sut.getAll()); |
182 | System.out.println("Oracle:"); | 182 | System.out.println("Oracle:"); |
183 | printEntrySet(oracle.entrySet().iterator()); | 183 | printEntrySet(oracle.entrySet().iterator()); |
184 | } | 184 | } |