Merge pull request #60 from spacecowboy/update-java-drivers

Update to latest java driver milestone

Author: spacecowboy

Makefile

@@ -55,7 +55,7 @@ clean: ## Clean build directories
 	rm -rf tmp
 	./gradlew clean
 
-rmhosts:
+rmhosts: ## Remove known hosts file
 	rm -rf ~/.neo4j/known_hosts
 
 launch: rmhosts clean build run ## Removes known hosts file, cleans, builds, and runs the shell

build.gradle

@@ -62,7 +62,7 @@ subprojects {
 ext {
     argparse4jVersion = '0.7.0'
     junitVersion = '4.12'
-    neo4jJavaVersion = '1.1.0-M02'
+    neo4jJavaVersion = '1.1.0-M05'
     findbugsVersion = '3.0.0'
     jansiVersion = '1.13'
     jlineVersion = '2.14.2'

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellIntegrationTest.java

@@ -32,7 +32,7 @@ public class CypherShellIntegrationTest {
     private Logger logger = mock(Logger.class);
     private Command rollbackCommand;
     private Command commitCommand;
-    private Command beginCommand ;
+    private Command beginCommand;
     private CypherShell shell;
 
     @Before
@@ -49,7 +49,7 @@ public void setUp() throws Exception {
 
     @After
     public void tearDown() throws Exception {
-        shell.execute("MATCH (n:TestPerson) DETACH DELETE (n)");
+        shell.execute("MATCH (n) DETACH DELETE (n)");
     }
 
     @Test
@@ -100,7 +100,43 @@ public void rollbackScenario() throws CommandException {
         rollbackCommand.execute("");
 
         //then
-        shell.execute("MATCH (n:TestPerson) RETURN n");
+        shell.execute("MATCH (n) RETURN n");
+
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(logger, times(3)).printOut(captor.capture());
+
+        List<String> result = captor.getAllValues();
+        assertThat(result.get(2), is("n\n(:TestPerson {name: \"Jane Smith\"})"));
+    }
+
+    @Test
+    public void resetOutOfTxScenario() throws CommandException {
+        //when
+        shell.execute("CREATE (:TestPerson {name: \"Jane Smith\"})");
+        shell.reset();
+
+        //then
+        shell.execute("CREATE (:TestPerson {name: \"Jane Smith\"})");
+        shell.execute("MATCH (n) RETURN n");
+
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(logger, times(3)).printOut(captor.capture());
+
+        List<String> result = captor.getAllValues();
+        assertThat(result.get(2), is("n\n(:TestPerson {name: \"Jane Smith\"})" +
+                "\n(:TestPerson {name: \"Jane Smith\"})"));
+    }
+
+    @Test
+    public void resetInTxScenario() throws CommandException {
+        //when
+        beginCommand.execute("");
+        shell.execute("CREATE (:Random)");
+        shell.reset();
+
+        //then
+        shell.execute("CREATE (:TestPerson {name: \"Jane Smith\"})");
+        shell.execute("MATCH (n) RETURN n");
 
         ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
         verify(logger, times(3)).printOut(captor.capture());
@@ -116,7 +152,7 @@ public void commitScenario() throws CommandException {
         commitCommand.execute("");
 
         //then
-        shell.execute("MATCH (n:TestPerson) RETURN n");
+        shell.execute("MATCH (n) RETURN n");
 
         ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
         verify(logger, times(2)).printOut(captor.capture());
@@ -126,7 +162,7 @@ public void commitScenario() throws CommandException {
     }
 
     @Test
-    public void setUnsetVariables() throws CommandException {
+    public void setAndListVariables() throws CommandException {
         assertTrue(shell.getAll().isEmpty());
 
         long randomLong = System.currentTimeMillis();

tyrekicking.sh

@@ -11,7 +11,7 @@ function prepare-bundle {
 }
 
 function testscript {
-  if cypher-shell/cypher-shell "RETURN 1;"; then
+  if cypher-shell/cypher-shell -u neo4j -p neo "RETURN 1;"; then
     echo "$1 Success!"
   else
     echo "$1 Failure!"