Revert "Enable test that requires boltkit"

Author: Zhen Li

driver/pom.xml

@@ -154,16 +154,6 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19</version>
-        <configuration>
-          <excludes>
-            <exclude>**/*BoltKitTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>

driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitTest.java

@@ -19,15 +19,22 @@
 
 package org.neo4j.driver.internal;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.net.URI;
 
 import org.neo4j.driver.internal.net.BoltServerAddress;
+import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.GraphDatabase;
+import org.neo4j.driver.v1.Record;
+import org.neo4j.driver.v1.Session;
+import org.neo4j.driver.v1.util.StubServer;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
+import static org.neo4j.driver.v1.Values.parameters;
 
 public class DirectDriverTest
 {
@@ -60,4 +67,30 @@ public void shouldRegisterSingleServer()
         assertThat( driverAddress, equalTo( address ));
 
     }
-}
+
+    @Ignore
+    public void shouldBeAbleRunCypher() throws StubServer.ForceKilled, InterruptedException, IOException
+    {
+        // Given
+        StubServer server = StubServer.start( "return_x.script", 9001 );
+        URI uri = URI.create( "bolt://127.0.0.1:9001" );
+        int x;
+
+        // When
+        try ( Driver driver = GraphDatabase.driver( uri ) )
+        {
+            try ( Session session = driver.session() )
+            {
+                Record record = session.run( "RETURN {x}", parameters( "x", 1 ) ).single();
+                x = record.get( 0 ).asInt();
+            }
+        }
+
+        // Then
+        assertThat( x, equalTo( 1 ) );
+
+        // Finally
+        assertThat( server.exitStatus(), equalTo( 0 ) );
+    }
+
+}

driver/src/test/java/org/neo4j/driver/internal/DirectDriverTest.java

@@ -18,6 +18,8 @@
  */
 package org.neo4j.driver.internal;
 
+import gherkin.lexer.Tr;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -43,6 +45,7 @@
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.Transaction;
+import org.neo4j.driver.v1.exceptions.ConnectionFailureException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 import org.neo4j.driver.v1.exceptions.SessionExpiredException;
 import org.neo4j.driver.v1.util.Function;
@@ -60,7 +63,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class RoutingDriverBoltKitTest
+@Ignore
+public class RoutingDriverStubTest
 {
     @Rule
     public ExpectedException exception = ExpectedException.none();

driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java renamed to driver/src/test/java/org/neo4j/driver/internal/RoutingDriverStubTest.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.neo4j.driver.internal.net.pooling;
+
+import org.junit.Ignore;
+
+@Ignore
+public class SocketConnectionPoolTest
+{
+
+    // TODO: write some tests that actually test something
+
+}

driver/src/test/java/org/neo4j/driver/internal/net/pooling/SocketConnectionPoolTest.java

@@ -19,12 +19,17 @@
 
 package org.neo4j.driver.v1;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.net.URI;
 
 import org.neo4j.driver.internal.DirectDriver;
+import org.neo4j.driver.internal.RoutingDriver;
+import org.neo4j.driver.v1.util.StubServer;
 
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertThat;
 
@@ -43,4 +48,23 @@ public void boltSchemeShouldInstantiateDirectDriver()
         assertThat( driver, instanceOf( DirectDriver.class ) );
 
     }
-}
+
+    @Ignore
+    public void boltPlusDiscoverySchemeShouldInstantiateClusterDriver() throws IOException, InterruptedException, StubServer.ForceKilled
+    {
+        // Given
+        StubServer server = StubServer.start( "discover_servers.script", 9001 );
+        URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
+
+        // When
+        Driver driver = GraphDatabase.driver( uri );
+
+        // Then
+        assertThat( driver, instanceOf( RoutingDriver.class ) );
+
+        // Finally
+        driver.close();
+        assertThat( server.exitStatus(), equalTo( 0 ) );
+    }
+
+}

driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseBoltKitTest.java

@@ -20,9 +20,7 @@
 package org.neo4j.driver.v1.util;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,7 +39,7 @@ public static class ForceKilled extends Exception {}
     private StubServer( String script, int port ) throws IOException, InterruptedException
     {
         List<String> command = new ArrayList<>();
-        command.addAll( singletonList( "boltstub" ) );
+        command.addAll( singletonList( "/usr/local/bin/boltstub" ) );
         command.addAll( asList( Integer.toString( port ), script ) );
         ProcessBuilder server = new ProcessBuilder().inheritIO().command( command );
         process = server.start();
@@ -76,14 +74,6 @@ private static String resource( String fileName )
         {
             fail( fileName + " does not exists" );
         }
-        try
-        {
-            return Paths.get( resource.toURI() ).toFile().getCanonicalPath();
-        }
-        catch ( Throwable e )
-        {
-            fail( e.toString() );
-            throw new RuntimeException( e );
-        }
+        return resource.getFile();
     }
 }

driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java

@@ -7,4 +7,4 @@ C: RUN "CALL dbms.cluster.routing.getServers" {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
-   SUCCESS {}
+   SUCCESS {}

driver/src/test/java/org/neo4j/driver/v1/util/StubServer.java

@@ -4,9 +4,8 @@
 !: AUTO PULL_ALL
 !: AUTO RUN "ROLLBACK" {}
 !: AUTO RUN "BEGIN" {}
-!: AUTO RUN "COMMIT" {}
 
 C: RUN "CREATE (n {name:'Bob'})" {}
    PULL_ALL
 S: SUCCESS {}
-   SUCCESS {}
+   SUCCESS {}