Merge pull request #99 from praveenag/master

fix integration test by moving it to to plain format

Author: praveenag

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

@@ -55,4 +55,44 @@ public void periodicCommitWorks() throws CommandException {
         List<String> queryResult = captor.getAllValues();
         assertThat(queryResult.get(1), containsString("Europe"));
     }
+
+    @Test
+    public void cypherWithProfileStatements() throws CommandException {
+        //when
+        shell.execute("CYPHER RUNTIME=INTERPRETED PROFILE RETURN null");
+
+        //then
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(logger, times(1)).printOut(captor.capture());
+
+        List<String> result = captor.getAllValues();
+        String actual = result.get(0);
+        //      This assertion checks everything except for time and cypher
+        assertThat(actual, containsString("Plan: \"PROFILE\""));
+        assertThat(actual, containsString("Statement: \"READ_ONLY\""));
+        assertThat(actual, containsString("Planner: \"COST\""));
+        assertThat(actual, containsString("Runtime: \"INTERPRETED\""));
+        assertThat(actual, containsString("DbHits: 0"));
+        assertThat(actual, containsString("Rows: 1"));
+        assertThat(actual, containsString("null"));
+        assertThat(actual, containsString("NULL"));
+    }
+
+    @Test
+    public void cypherWithExplainStatements() throws CommandException {
+        //when
+        shell.execute("CYPHER RUNTIME=INTERPRETED EXPLAIN RETURN null");
+
+        //then
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(logger, times(1)).printOut(captor.capture());
+
+        List<String> result = captor.getAllValues();
+        String actual = result.get(0);
+        //      This assertion checks everything except for time and cypher
+        assertThat(actual, containsString("Plan: \"EXPLAIN\""));
+        assertThat(actual, containsString("Statement: \"READ_ONLY\""));
+        assertThat(actual, containsString("Planner: \"COST\""));
+        assertThat(actual, containsString("Runtime: \"INTERPRETED\""));
+    }
 }

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

@@ -80,46 +80,6 @@ public void cypherWithReturnStatements() throws CommandException {
         assertThat(result.get(0), containsString("Added 1 nodes, Set 1 properties, Added 1 labels"));
     }
 
-    @Test
-    public void cypherWithProfileStatements() throws CommandException {
-        //when
-        shell.execute("CYPHER RUNTIME=INTERPRETED PROFILE RETURN null");
-
-        //then
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-        verify(logger, times(1)).printOut(captor.capture());
-
-        List<String> result = captor.getAllValues();
-        String actual = result.get(0);
-        assertThat(actual, containsString("+------+\n| null |\n+------+\n| NULL |\n+------+"));
-        assertThat(actual, containsString("| \"PROFILE\" | \"READ_ONLY\" | \"CYPHER 3." ));
-        assertThat(actual, containsString("| \"COST\"  | \"INTERPRETED\" | " ));
-        assertThat(actual, containsString("| Operator        | Estimated Rows | Rows | DB Hits " ));
-        assertThat(actual, containsString("| Identifiers | Other           |" ));
-        assertThat(actual, containsString("| +Projection     |              1 |    1 |       0 " ));
-        assertThat(actual, containsString("| null        | {null : Null()} |" ));
-        assertThat(actual, containsString("1 row available after "));
-    }
-
-    @Test
-    public void cypherWithExplainStatements() throws CommandException {
-        //when
-        shell.execute("CYPHER RUNTIME=INTERPRETED EXPLAIN RETURN null");
-
-        //then
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-        verify(logger, times(1)).printOut(captor.capture());
-
-        List<String> result = captor.getAllValues();
-        String actual = result.get(0);
-        assertThat(actual, containsString("| \"EXPLAIN\" | \"READ_ONLY\" | \"CYPHER "));
-        assertThat(actual, containsString("| \"COST\"  | \"INTERPRETED\" |"));
-        assertThat(actual, containsString("| Operator        | Estimated Rows | Identifiers | Other           |" ));
-        assertThat(actual, containsString("| +ProduceResults |              1 | null        | " ));
-        assertThat(actual, containsString("| +Projection     |              1 | null        | {null : Null()} |" ));
-        assertThat(actual, containsString("0 rows available after "));
-    }
-
     @Test
     public void connectTwiceThrows() throws CommandException {
         thrown.expect(CommandException.class);