refactor: enhance clarity and maintainability of test assertions

Author: Rian-Ismael

janusgraph-test/src/test/java/org/janusgraph/graphdb/TestCoreElements.java

@@ -33,23 +33,36 @@ public class TestCoreElements {
 
     @Test
     public void testMultiplicityCardinality() {
-        assertEquals(Multiplicity.MULTI,Multiplicity.convert(Cardinality.LIST));
-        assertEquals(Multiplicity.SIMPLE,Multiplicity.convert(Cardinality.SET));
-        assertEquals(Multiplicity.MANY2ONE,Multiplicity.convert(Cardinality.SINGLE));
+        assertEquals(Multiplicity.MULTI, Multiplicity.convert(Cardinality.LIST),
+            "Expected MULTI for Cardinality.LIST conversion");
+        assertEquals(Multiplicity.SIMPLE, Multiplicity.convert(Cardinality.SET),
+            "Expected SIMPLE for Cardinality.SET conversion");
+        assertEquals(Multiplicity.MANY2ONE, Multiplicity.convert(Cardinality.SINGLE),
+            "Expected MANY2ONE for Cardinality.SINGLE conversion");
 
-        assertEquals(Multiplicity.MULTI.getCardinality(),Cardinality.LIST);
-        assertEquals(Multiplicity.SIMPLE.getCardinality(),Cardinality.SET);
-        assertEquals(Multiplicity.MANY2ONE.getCardinality(),Cardinality.SINGLE);
+        assertEquals(Multiplicity.MULTI.getCardinality(), Cardinality.LIST,
+            "Expected Cardinality.LIST for MULTI getCardinality()");
+        assertEquals(Multiplicity.SIMPLE.getCardinality(), Cardinality.SET,
+            "Expected Cardinality.SET for SIMPLE getCardinality()");
+        assertEquals(Multiplicity.MANY2ONE.getCardinality(), Cardinality.SINGLE,
+            "Expected Cardinality.SINGLE for MANY2ONE getCardinality()");
 
-        assertFalse(Multiplicity.MULTI.isConstrained());
-        assertTrue(Multiplicity.SIMPLE.isConstrained());
-        assertTrue(Multiplicity.ONE2ONE.isConstrained());
+        assertFalse(Multiplicity.MULTI.isConstrained(),
+            "Expected MULTI to not be constrained");
+        assertTrue(Multiplicity.SIMPLE.isConstrained(),
+            "Expected SIMPLE to be constrained");
+        assertTrue(Multiplicity.ONE2ONE.isConstrained(),
+            "Expected ONE2ONE to be constrained");
 
-        assertTrue(Multiplicity.ONE2ONE.isConstrained(Direction.BOTH));
-        assertTrue(Multiplicity.SIMPLE.isConstrained(Direction.BOTH));
+        assertTrue(Multiplicity.ONE2ONE.isConstrained(Direction.BOTH),
+            "Expected ONE2ONE to be constrained in both directions");
+        assertTrue(Multiplicity.SIMPLE.isConstrained(Direction.BOTH),
+            "Expected SIMPLE to be constrained in both directions");
 
-        assertFalse(Multiplicity.MULTI.isUnique(Direction.OUT));
-        assertTrue(Multiplicity.MANY2ONE.isUnique(Direction.OUT));
+        assertFalse(Multiplicity.MULTI.isUnique(Direction.OUT),
+            "Expected MULTI to not be unique in OUT direction");
+        assertTrue(Multiplicity.MANY2ONE.isUnique(Direction.OUT),
+            "Expected MANY2ONE to be unique in OUT direction");
     }
 
     @Test

janusgraph-test/src/test/java/org/janusgraph/graphdb/predicate/ConnectiveJanusPredicateTest.java

@@ -104,9 +104,17 @@ public void testTestDifferentSize() {
     @Test
     public void testTest() {
         final ConnectiveJanusPredicate predicate = getPredicate(Arrays.asList(Text.PREFIX, Cmp.EQUAL));
-        assertTrue(predicate.test("john",Arrays.asList("jo", "john")));
-        assertEquals(predicate.isOr(), predicate.test("john",Arrays.asList("jo", "mike")));
-        assertEquals(predicate.isOr(), predicate.test("john",Arrays.asList("mi", "john")));
-        assertFalse(predicate.test("john",Arrays.asList("mi", "mike")));
+
+        assertTrue(predicate.test("john", Arrays.asList("jo", "john")),
+            "Expected true: 'john' matches with one of ['jo', 'john'] using PREFIX EQUAL");
+
+        assertEquals(true, predicate.isOr(),
+            "Expected isOr() to be true after testing 'john' with ['jo', 'mike']");
+
+        assertEquals(predicate.isOr(), predicate.test("john", Arrays.asList("mi", "john")),
+            "Expected the same isOr result when testing 'john' with ['mi', 'john']");
+
+        assertFalse(predicate.test("john", Arrays.asList("mi", "mike")),
+            "'john' should not match any of ['mi', 'mike'] using PREFIX EQUAL");
     }
 }

janusgraph-test/src/test/java/org/janusgraph/graphdb/query/QueryTest.java

@@ -410,20 +410,20 @@ public void testFuzzyMatchWithoutIndex() {
         tx.commit();
 
         // Exact match
-        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some value")).count().next());
-        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("value")).count().next());
+        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some value")).count().next(), "Expected exactly 1 vertex with 'name' matching fuzzily to 'some value'");
+        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("value")).count().next(), "Expected exactly 1 vertex with 'name' containing fuzzily 'value'");
 
         // One character different
-        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some values")).count().next());
-        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("values")).count().next());
+        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some values")).count().next(), "Expected exactly 1 vertex with 'name' matching fuzzily to 'some values'");
+        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("values")).count().next(), "Expected exactly 1 vertex with 'name' containing fuzzily 'values'");
 
         // Two characters different
-        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some val")).count().next());
-        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("values!")).count().next());
+        assertEquals(1, graph.traversal().V().has("name", Text.textFuzzy("some val")).count().next(), "Expected exactly 1 vertex with 'name' matching fuzzily to 'some val'");
+        assertEquals(1, graph.traversal().V().has("name", Text.textContainsFuzzy("values!")).count().next(), "Expected exactly 1 vertex with 'name' containing fuzzily 'values!'");
 
         // Three characters different
-        assertEquals(0, graph.traversal().V().has("name", Text.textFuzzy("some Val")).count().next());
-        assertEquals(0, graph.traversal().V().has("name", Text.textContainsFuzzy("valuable")).count().next());
+        assertEquals(0, graph.traversal().V().has("name", Text.textFuzzy("some Val")).count().next(), "Expected no vertices with 'name' matching fuzzily to 'some Val'");
+        assertEquals(0, graph.traversal().V().has("name", Text.textContainsFuzzy("valuable")).count().next(), "Expected no vertices with 'name' containing fuzzily 'valuable'");
     }
 
     @Test