#415: Add equality tests to ParseGraphTest.

Since it is removed from the AutoEqualityTest, included the test to ParseGraphTest instead.
parsingdata · Mar 18, 2024 · f31e41e · f31e41e
1 parent ecc9787
commit f31e41e
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 2 deletions.
diff --git a/core/src/test/java/io/parsingdata/metal/AutoEqualityTest.java b/core/src/test/java/io/parsingdata/metal/AutoEqualityTest.java
@@ -436,10 +436,10 @@ public void basicNoHashCollisions(final Object object, final Object same, final
         }
     }
 
-    private static void assertEquals(final Object o, final Object object) {
+    public static void assertEquals(final Object o, final Object object) {
         Assertions.assertEquals(o, object, String.format("Objects should be equal:\n%s\n%s\n", o, object));
     }
-    private static void assertNotEquals(final Object o, final Object object) {
+    public static void assertNotEquals(final Object o, final Object object) {
         Assertions.assertNotEquals(o, object, String.format("Objects should not be equal:\n%s\n%s\n", o, object));
     }
 

diff --git a/core/src/test/java/io/parsingdata/metal/data/ParseGraphTest.java b/core/src/test/java/io/parsingdata/metal/data/ParseGraphTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -37,12 +38,15 @@
 import static io.parsingdata.metal.util.TokenDefinitions.any;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import io.parsingdata.metal.AutoEqualityTest;
 import io.parsingdata.metal.encoding.Encoding;
 import io.parsingdata.metal.token.Token;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -57,6 +61,7 @@ public class ParseGraphTest {
     private static ParseGraph pg;
     private static ParseGraph pgc;
     private static ParseGraph pgl;
+    private static List<ParseGraph> pgs;
     private static Token aDef;
     private static ParseValue a;
     private static ParseValue b;
@@ -92,6 +97,7 @@ public static void setup() {
         pg = makeSimpleGraph();
         pgc = makeCycleGraph();
         pgl = makeLongGraph();
+        pgs = makeGraphList();
     }
 
     private static ParseGraph makeSimpleGraph() {
@@ -246,6 +252,79 @@ public void testCurrent() {
         assertFalse(EMPTY.addBranch(NONE).current().isPresent());
     }
 
+    private static List<ParseGraph> makeGraphList() {
+        return List.of(
+            EMPTY,
+            EMPTY.add(a),
+            EMPTY.add(b),
+            EMPTY.add(a).add(b),
+            EMPTY.add(b).add(a),
+
+            EMPTY.addBranch(t),
+            EMPTY.addBranch(s),
+            EMPTY.add(a).addBranch(s),
+            EMPTY.add(a).addBranch(t),
+            EMPTY.add(b).addBranch(s),
+            EMPTY.add(b).addBranch(t),
+            EMPTY.add(a).addBranch(t).addBranch(s),
+            EMPTY.add(a).addBranch(s).addBranch(t),
+            EMPTY.add(b).addBranch(s).addBranch(t),
+            EMPTY.add(b).addBranch(t).addBranch(s),
+
+            EMPTY.add(a).addBranch(t).add(a),
+            EMPTY.add(a).addBranch(t).add(b),
+            EMPTY.add(b).addBranch(s).add(a),
+            EMPTY.add(b).addBranch(t).add(b),
+            EMPTY.add(a).addBranch(t).add(a).addBranch(s),
+            EMPTY.add(a).addBranch(s).add(b).addBranch(t),
+            EMPTY.add(b).addBranch(s).add(a).addBranch(t),
+            EMPTY.add(b).addBranch(t).add(b).addBranch(s),
+
+            EMPTY.add(a).addBranch(t).add(a).addBranch(s).add(a),
+            EMPTY.add(a).addBranch(t).add(a).addBranch(s).add(b),
+            EMPTY.add(a).addBranch(s).add(b).addBranch(t).add(a),
+            EMPTY.add(a).addBranch(s).add(b).addBranch(t).add(b),
+            EMPTY.add(b).addBranch(s).add(a).addBranch(t).add(a),
+            EMPTY.add(b).addBranch(s).add(a).addBranch(t).add(b),
+            EMPTY.add(b).addBranch(t).add(b).addBranch(s).add(a),
+            EMPTY.add(b).addBranch(t).add(b).addBranch(s).add(b)
+        );
+    }
+
+    public static Stream<Arguments> nonEqualityTest() {
+        final List<Arguments> args = new ArrayList<>();
+        for (int i = 0; i < pgs.size(); i++) {
+            for (int j = 0; j < pgs.size(); j++) {
+                if (i != j) {
+                    args.add(arguments(i + "," + j, pgs.get(i), pgs.get(j)));
+                }
+            }
+        }
+        return args.stream();
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void nonEqualityTest(final String testnr, final ParseGraph first, final ParseGraph second) {
+        AutoEqualityTest.assertNotEquals(first, second);
+        AutoEqualityTest.assertNotEquals(first.hashCode(), second.hashCode());
+    }
+
+    public static Stream<Arguments> equalityTest() {
+        final List<Arguments> args = new ArrayList<>();
+        for (int i = 0; i < pgs.size(); i++) {
+            args.add(arguments(i, pgs.get(i), pgs.get(i)));
+        }
+        return args.stream();
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void equalityTest(final int testnr, final ParseGraph first, final ParseGraph second) {
+        AutoEqualityTest.assertEquals(first, second);
+        AutoEqualityTest.assertEquals(first.hashCode(), second.hashCode());
+    }
+
     public static Stream<Arguments> scopeDepthTest() {
         return Stream.of(
             // Add branches with and without scope delimited tokens.