Updated step regexp

Author: RagnarW

driver/src/test/java/org/neo4j/driver/v1/tck/CypherComplianceSteps.java

@@ -31,17 +31,16 @@
 
 import org.neo4j.driver.v1.ResultCursor;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.tck.tck.util.Types;
 import org.neo4j.driver.v1.tck.tck.util.runners.CypherStatementRunner;
 import org.neo4j.driver.v1.tck.tck.util.runners.MappedParametersRunner;
 import org.neo4j.driver.v1.tck.tck.util.runners.StringRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.driver.v1.tck.DriverComplianceIT.session;
+import static org.neo4j.driver.v1.tck.Environment.mappedTypes;
 import static org.neo4j.driver.v1.tck.Environment.runners;
 import static org.neo4j.driver.v1.tck.tck.util.ResultParser.getParametersFromListOfKeysAndValues;
-import static org.neo4j.driver.v1.tck.tck.util.ResultParser.getTypeMapFromString;
 import static org.neo4j.driver.v1.tck.tck.util.ResultParser.parseExpected;
 import static org.neo4j.driver.v1.tck.tck.util.ResultParser.parseGiven;
 import static org.neo4j.driver.v1.tck.tck.util.Types.getType;
@@ -96,12 +95,11 @@ public void result_should_be_a_type_containing(String type, DataTable table) thr
         }
     }
 
-    @Then( "^result should be mixed: \"(.*)\"$" )
-    public void result_should_be_mixed_a_node_b_node_l_integer( String stringTypes, DataTable table ) throws Throwable
+    @Then( "^result should be mixed:" )
+    public void result_should_be_mixed( DataTable table ) throws Throwable
     {
         for( CypherStatementRunner runner : runners)
         {
-            Map<String,Types.Type> types = getTypeMapFromString( stringTypes );
             ResultCursor rc = runner.result();
             List<String> keys = table.topCells();
             Collection<Map> given = new ArrayList<>(  );
@@ -117,7 +115,7 @@ public void result_should_be_mixed_a_node_b_node_l_integer( String stringTypes,
                     tmpGiven.put( key, parseGiven( rc.record().asMap().get( key ) ) );
                 }
                 given.add( tmpGiven );
-                expected.add( parseExpected( table.diffableRows().get( i + 1 ).convertedRow, keys, types ) );
+                expected.add( parseExpected( table.diffableRows().get( i + 1 ).convertedRow, keys, mappedTypes ) );
                 i++;
             }
             assertTrue( expected.size() > 0 );
@@ -161,4 +159,16 @@ private boolean equalRecords( Collection<Map> one, Collection<Map> other )
         return other.size() == 0;
 
     }
+
+    @Then( "^result should map to types:$" )
+    public void result_should_map_to_types(DataTable table) throws Throwable
+    {
+        List<String> keys = table.topCells();
+        List<String> values = table.diffableRows().get( 1 ).convertedRow;
+        mappedTypes = new HashMap<>(  );
+        for (int i = 0; i < keys.size(); i++)
+        {
+            mappedTypes.put( keys.get( i ), getType( values.get( i ) ) );
+        }
+    }
 }

driver/src/test/java/org/neo4j/driver/v1/tck/Environment.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.tck.tck.util.Types;
 import org.neo4j.driver.v1.tck.tck.util.runners.CypherStatementRunner;
 import org.neo4j.driver.v1.tck.tck.util.runners.MappedParametersRunner;
 import org.neo4j.driver.v1.tck.tck.util.runners.StatementRunner;
@@ -43,6 +44,7 @@ public class Environment
     public static Value expectedBoltValue;
     public static List<Object> listOfObjects;
     public static Map<String,Object> mapOfObjects;
+    public static Map<String,Types.Type> mappedTypes;
 
 
     @Before
@@ -56,6 +58,7 @@ public void resetValues()
         statementRunner = null;
         stringRunner = null;
         runners = new ArrayList<>();
+        mappedTypes = new HashMap<>(  );
     }
 
     @Before("@reset_database")

driver/src/test/java/org/neo4j/driver/v1/tck/tck/util/ResultParser.java

@@ -41,7 +41,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.neo4j.driver.internal.types.InternalTypeSystem.TYPE_SYSTEM;
 import static org.neo4j.driver.v1.tck.tck.util.Types.Type;
-import static org.neo4j.driver.v1.tck.tck.util.Types.getType;
 
 public class ResultParser
 {
@@ -337,17 +336,6 @@ private static Map<String,Value> getProperties( String input )
         return properties;
     }
 
-    public static Map<String,Type> getTypeMapFromString( String input )
-    {
-        Map<String,Value> tmpMap = getProperties( input );
-        Map<String,Type> converted = new HashMap<>();
-        for ( String key : tmpMap.keySet() )
-        {
-            converted.put( key, getType( tmpMap.get( key ).asString() ) );
-        }
-        return converted;
-    }
-
     public static Map<String,Value> getParametersFromListOfKeysAndValues( List<String> keys, List<String> values )
     {
         assertEquals( keys.size(), values.size() );