Change TCK matcher toString() to align with actual results

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/BooleanMatcher.java

@@ -37,6 +37,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "BooleanMatcher(" + value + ")";
+        return Boolean.toString( value );
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/FloatMatcher.java

@@ -37,6 +37,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "FloatMatcher(" + value + ")";
+        return Double.toString( value );
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/IntegerMatcher.java

@@ -37,6 +37,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "IntegerMatcher(" + value + ")";
+        return Long.toString( value );
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java

@@ -70,6 +70,6 @@ private boolean sizeAndElements( int length, Function<Integer,Object> resultList
     @Override
     public String toString()
     {
-        return "ListMatcher" + list.toString();
+        return list.toString();
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java

@@ -61,6 +61,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "MapMatcher" + map.toString();
+        return map.toString();
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java

@@ -59,6 +59,10 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "NodeMatcher" + labelNames + propertyMatcher;
+        StringBuilder sb = new StringBuilder();
+        sb.append( "(" );
+        labelNames.forEach( ( l ) -> sb.append( ":" ).append( l ) );
+        sb.append( " " ).append( propertyMatcher ).append( ")" );
+        return sb.toString();
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java

@@ -70,9 +70,10 @@ public void setRightNode( NodeMatcher rightNode )
     @Override
     public String toString()
     {
-        return "PathLinkMatcher <<"
-               + leftNode + (outgoing ? "-" : "<-")
-               + relMatcher + (outgoing ? "->" : "-")
-               + rightNode + ">>";
+        StringBuilder sb = new StringBuilder();
+        sb.append( leftNode ).append( (outgoing ? "-" : "<-") );
+        sb.append( relMatcher ).append( (outgoing ? "->" : "-") );
+        sb.append( rightNode );
+        return sb.toString();
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java

@@ -81,11 +81,15 @@ public String toString()
     {
         if ( pathLinks.isEmpty() )
         {
-            return "PathMatcher" + singleNodePath;
+            return "<" + singleNodePath + ">";
         }
         else
         {
-            return "PathMatcher" + pathLinks;
+            StringBuilder sb = new StringBuilder(  );
+            sb.append( "<" );
+            pathLinks.forEach( sb::append );
+            sb.append( ">" );
+            return sb.toString();
         }
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java

@@ -48,6 +48,9 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "RelationshipMatcher[" + relationshipTypeName + "]" + propertyMatcher;
+        StringBuilder sb = new StringBuilder();
+        sb.append( "[:" ).append( relationshipTypeName );
+        sb.append( " " ).append( propertyMatcher ).append( "]" );
+        return sb.toString();
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ResultMatcher.java

@@ -101,10 +101,11 @@ private void exhaust( Result value )
     @Override
     public String toString()
     {
-        StringBuilder sb = new StringBuilder( "ResultMatcher of:\n" );
+        StringBuilder sb = new StringBuilder( "Expected result of:\n" );
+        int i = 1;
         for ( RowMatcher row : rowMatchers )
         {
-            sb.append( row ).append( "\n" );
+            sb.append( "[" ).append( i++ ).append( "] " ).append( row ).append( "\n" );
         }
         return sb.toString();
     }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java

@@ -52,6 +52,6 @@ public boolean matches( Map<String,Object> value )
     @Override
     public String toString()
     {
-        return "RowMatcher" + values;
+        return "expectedRow:" + values;
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java

@@ -37,6 +37,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "StringMatcher(" + string + ")";
+        return "'" + string + "'";
     }
 }

community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ValueMatcher.java

@@ -34,7 +34,7 @@ public boolean matches( Object value )
         @Override
         public String toString()
         {
-            return "NullMatcher";
+            return "null";
         }
     };
 }