Temporarily runs in_dev files to show errors on TCK branch

Author: RagnarW

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

@@ -30,7 +30,7 @@
  * The base class to run all cucumber tests
  */
 @RunWith( DriverCucumberAdapter.class )
-@CucumberOptions( features = {"target/resources/features"}, tags={"~@in_dev"}, format = {"pretty"})
+@CucumberOptions( features = {"target/resources/features"}, strict=true, tags={"~@db"}, format = {"pretty"})
 public class DriverComplianceIT
 {
     @ClassRule

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

@@ -35,7 +35,6 @@
 import org.neo4j.driver.v1.Statement;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
-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;
@@ -53,10 +52,7 @@
 import static org.neo4j.driver.v1.tck.Environment.runners;
 import static org.neo4j.driver.v1.tck.Environment.statementRunner;
 import static org.neo4j.driver.v1.tck.Environment.stringRunner;
-import static org.neo4j.driver.v1.tck.tck.util.ResultParser.getList;
-import static org.neo4j.driver.v1.tck.tck.util.ResultParser.getMapOfObjects;
-import static org.neo4j.driver.v1.tck.tck.util.ResultParser.isList;
-import static org.neo4j.driver.v1.tck.tck.util.ResultParser.isMap;
+import static org.neo4j.driver.v1.tck.tck.util.ResultParser.getJavaValueIntAsLong;
 import static org.neo4j.driver.v1.tck.tck.util.Types.Type;
 import static org.neo4j.driver.v1.tck.tck.util.Types.getType;
 
@@ -73,10 +69,9 @@ public void A_running_database() throws Throwable
     }
 
     @Given( "^a value (.*)$" )
-    public void a_value( String value )
-            throws Throwable
+    public void a_value( String value ) throws Throwable
     {
-        expectedJavaValue = getJavaValue( value );
+        expectedJavaValue = getJavaValueIntAsLong( value );
         expectedBoltValue = Values.value( expectedJavaValue );
     }
 
@@ -143,12 +138,12 @@ public void the_driver_asks_the_server_to_echo_this_map_back() throws Throwable
     }
 
     @Given( "^a list containing$" )
-    public void a_list_containing( List<String> table ) throws Throwable
+    public static void a_list_containing( List<String> table ) throws Throwable
     {
         List<String> content = table.subList( 1, table.size() - 1 );
         for ( String value : content )
         {
-            listOfObjects.add( getJavaValue( value ) );
+            listOfObjects.add( getJavaValueIntAsLong( value ) );
         }
     }
 
@@ -159,14 +154,14 @@ public void adding_this_list_to_itself() throws Throwable
     }
 
     @Given( "^a map containing$" )
-    public void a_map_containing( DataTable table ) throws Throwable
+    public static void a_map_containing( DataTable table ) throws Throwable
     {
         Map<String,String> map = table.asMap( String.class, String.class );
         for ( String key : map.keySet() )
         {
             if ( !key.equals( "key" ) )
             {
-                mapOfObjects.put( (String) Type.String.getJavaValue( key ), getJavaValue( map.get( key ) ) );
+                mapOfObjects.put( (String) Type.String.getJavaValue( key ), getJavaValueIntAsLong( map.get( key ) ) );
             }
         }
     }
@@ -193,27 +188,6 @@ public void result_should_be_equal_to_a_single_Type_of_Input() throws Throwable
         }
     }
 
-    public Object getJavaValue( String value )
-    {
-        if ( isList( value ) )
-        {
-            ArrayList<Object> values = new ArrayList<>();
-            for ( String val : getList( value ) )
-            {
-                values.add( Types.asObject( val ) );
-            }
-            return values;
-        }
-        else if ( isMap( value ) )
-        {
-            return getMapOfObjects( value );
-        }
-        else
-        {
-            return Types.asObject( value );
-        }
-    }
-
     public String getRandomString( long size )
     {
         StringBuilder stringBuilder = new StringBuilder();
@@ -251,5 +225,4 @@ public boolean databaseRunning()
     {
         return session() != null;
     }
-
 }