Cypher Quality Assurance

core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java

@@ -522,7 +522,7 @@ private Expression translateCall( RexCall call, RexImpTable.NullAs nullAs ) {
         final Operator operator = call.getOperator();
         CallImplementor implementor = RexImpTable.INSTANCE.get( operator );
         if ( implementor == null ) {
-            throw new GenericRuntimeException( "cannot translate call " + call );
+            throw new GenericRuntimeException( "Cannot translate call " + call );
         }
         return implementor.implement( this, call, nullAs );
     }

dbms/src/test/java/org/polypheny/db/cypher/CypherTestTemplate.java

@@ -17,6 +17,8 @@
 package org.polypheny.db.cypher;
 
 import static java.lang.String.format;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
@@ -48,6 +50,7 @@
 import org.polypheny.db.util.Pair;
 import org.polypheny.db.webui.models.results.GraphResult;
 
+
 @Slf4j
 public class CypherTestTemplate {
 
@@ -58,6 +61,8 @@ public class CypherTestTemplate {
     protected static final String SINGLE_NODE_PERSON_COMPLEX_1 = "CREATE (p:Person {name: 'Ann', age: 45, depno: 13})";
     protected static final String SINGLE_NODE_PERSON_COMPLEX_2 = "CREATE (p:Person {name: 'Bob', age: 31, depno: 13})";
 
+    protected static final String SINGLE_NODE_PERSON_COMPLEX_3 = "CREATE (p:Person {name: 'Alex', age: 32, depno: 14})";
+
     protected static final String SINGLE_NODE_ANIMAL = "CREATE (a:Animal {name:'Kira', age:3, type:'dog'})";
     protected static final String SINGLE_NODE_GEOM = "CREATE (c:City {name:'Basel', location:'POINT (7.586052 47.559152)'})";
     protected static final String SINGLE_EDGE_1 = "CREATE (p:Person {name: 'Max'})-[rel:OWNER_OF]->(a:Animal {name:'Kira', age:3, type:'dog'})";
@@ -172,7 +177,6 @@ public boolean containsIn( GraphResult actual, boolean exclusive, int index, @Nu
         }
 
         return contains;
-
     }
 
 
@@ -186,13 +190,12 @@ public static boolean containsRows( GraphResult actual, boolean exclusive, boole
                 i++;
             }
 
-            assert !exclusive || actual.getData().length >= rows.length;
+            // Use assert to validate exclusive condition
+            assertTrue( !exclusive || actual.getData().length >= rows.length, "Exclusive condition failed: actual data has fewer rows than expected." );
+
+            // Use the appropriate matching method based on the 'ordered' flag
+            return ordered ? matchesExactRows( parsed, rows ) : matchesUnorderedRows( parsed, rows );
 
-            if ( ordered ) {
-                return matchesExactRows( parsed, rows );
-            } else {
-                return matchesUnorderedRows( parsed, rows );
-            }
         } catch ( Throwable t ) {
             fail( "Error while evaluating result: " + t.getMessage() );
             throw new RuntimeException();
@@ -201,40 +204,32 @@ public static boolean containsRows( GraphResult actual, boolean exclusive, boole
 
 
     private static boolean matchesUnorderedRows( List<List<PolyValue>> parsed, Row[] rows ) {
-
         List<Integer> used = new ArrayList<>();
-        for ( Row row : rows ) {
 
-            int i = 0;
+        for ( Row row : rows ) {
             boolean matches = false;
-            for ( List<PolyValue> objects : parsed ) {
 
-                if ( !matches && !used.contains( i ) ) {
-                    if ( row.matches( objects ) ) {
-                        used.add( i );
-                        matches = true;
-                    }
+            for ( int i = 0; i < parsed.size(); i++ ) {
+                if ( !matches && !used.contains( i ) && row.matches( parsed.get( i ) ) ) {
+                    used.add( i );
+                    matches = true;
+                    break;
                 }
-
-                i++;
-            }
-            if ( !matches ) {
-                return false;
             }
+
+            // Use assert to validate that each row finds a match
+            assertTrue( matches, "Row " + row + " could not be matched in the parsed data." );
         }
         return true;
-
     }
 
 
     private static boolean matchesExactRows( List<List<PolyValue>> parsed, Row[] rows ) {
-        boolean matches = true;
-        int j = 0;
-        for ( Row row : rows ) {
-            matches &= row.matches( parsed.get( j ) );
-            j++;
+        for ( int j = 0; j < rows.length; j++ ) {
+            // Use assert to ensure each row matches
+            assertTrue( rows[j].matches( parsed.get( j ) ), "Row " + j + " does not match the expected value." );
         }
-        return matches;
+        return true;
     }
 
 
@@ -246,14 +241,15 @@ private <T extends GraphPropertyHolder> boolean contains( String[][] actual, boo
             parsed.add( PolyValue.JSON_WRAPPER.readValue( entry[index], clazz ) );
         }
 
-        assert !exclusive || parsed.size() == expected.length;
+        // Assert that if exclusive is true, the number of parsed items equals the number of expected items
+        assertEquals( exclusive ? expected.length : parsed.size(), parsed.size(), "Exclusive condition failed: parsed size does not match expected length." );
 
-        boolean contains = true;
         for ( TestObject node : expected ) {
-            contains &= parsed.stream().anyMatch( n -> node.matches( n, exclusive ) );
+            // Assert that each expected node matches at least one parsed element
+            assertTrue( parsed.stream().anyMatch( n -> node.matches( n, exclusive ) ), "Expected node does not match any parsed element." );
         }
 
-        return contains;
+        return true;
     }
 
 
@@ -280,7 +276,7 @@ protected boolean is( GraphResult res, Type type, int index ) {
 
 
     protected void assertEmpty( GraphResult res ) {
-        assert res.getData().length == 0;
+        assertEquals( 0, res.getData().length );
     }
 
 
@@ -361,5 +357,4 @@ public boolean matches( List<PolyValue> objects ) {
 
     }
 
-
 }

dbms/src/test/java/org/polypheny/db/cypher/DdlTest.java

@@ -16,7 +16,6 @@
 
 package org.polypheny.db.cypher;
 
-
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,8 +33,10 @@
 import org.polypheny.db.catalog.Catalog;
 import org.polypheny.db.catalog.entity.logical.LogicalGraph;
 import org.polypheny.db.catalog.entity.logical.LogicalNamespace;
+import org.polypheny.db.cypher.clause.write.DmlInsertTest;
 import org.polypheny.db.webui.models.results.GraphResult;
 
+
 @Tag("adapter")
 @Slf4j
 public class DdlTest extends CypherTestTemplate {
@@ -58,7 +59,6 @@ public void addGraphTest() {
         assertTrue( Catalog.snapshot().getNamespace( graphName ).isPresent() );
 
         execute( "DROP DATABASE " + graphName );
-
     }
 
 
@@ -70,7 +70,6 @@ public void createNamespaceTest( String namespaceName ) {
         execute( format( "CREATE %s %s", namespaceName, name ) );
 
         execute( format( "DROP %s %s", namespaceName, name ) );
-
     }
 
 
@@ -97,10 +96,8 @@ public void addPlacementTest() throws SQLException {
             execute( "DROP DATABASE " + graphName );
 
         } finally {
-
             removeStore( "store1" );
         }
-
     }
 
 
@@ -128,7 +125,6 @@ public void initialPlacementTest() throws SQLException {
         } finally {
             removeStore( "store1" );
         }
-
     }
 
 
@@ -160,13 +156,11 @@ public void deletePlacementTest() throws SQLException {
         } finally {
             removeStore( "store1" );
         }
-
     }
 
 
     @Test
     public void deletePlacementDataTest() throws SQLException {
-
         execute( "CREATE DATABASE " + graphName + " IF NOT EXISTS" );
 
         execute( DmlInsertTest.CREATE_COMPLEX_GRAPH_2, graphName );
@@ -191,7 +185,6 @@ public void deletePlacementDataTest() throws SQLException {
         } finally {
             removeStore( "store1" );
         }
-
     }
 
 
@@ -209,9 +202,7 @@ private void removeStore( String name ) throws SQLException {
         try ( JdbcConnection polyphenyDbConnection = new JdbcConnection( true ) ) {
             Connection connection = polyphenyDbConnection.getConnection();
             try ( Statement statement = connection.createStatement() ) {
-
                 statement.executeUpdate( String.format( "ALTER ADAPTERS DROP \"%s\"", name ) );
-
             }
         }
     }