Merge remote-tracking branch 'origin/1.1' into 1.2

Author: sherfert

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

@@ -158,7 +158,7 @@ public String formatInfo(@Nonnull ResultSummary summary) {
         String[] columns = info.keySet().toArray(new String[0]);
         StringBuilder sb = new StringBuilder();
         Record record = new InternalRecord(asList(columns), info.values().toArray(new Value[0]));
-        formatResultAndCountRows(columns, Collections.singletonList(record).iterator(), sb::append);
+        formatResultAndCountRows(columns, Collections.singletonList(record).iterator(), line -> sb.append( line).append( OutputFormatter.NEWLINE) );
         return sb.toString();
     }
 

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java

@@ -35,6 +35,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.mockito.Matchers.anyObject;
@@ -77,6 +78,36 @@ public void prettyPrintPlanInformation() {
         });
     }
 
+    @Test
+    public void prettyPrintPlanInformationWithNewlines() {
+        // given
+        ResultSummary resultSummary = mock(ResultSummary.class);
+        ProfiledPlan plan = mock(ProfiledPlan.class);
+
+        when(resultSummary.hasPlan()).thenReturn(true);
+        when(resultSummary.hasProfile()).thenReturn(false);
+        when(resultSummary.plan()).thenReturn(plan);
+        when(resultSummary.resultAvailableAfter(anyObject())).thenReturn(5L);
+        when(resultSummary.resultConsumedAfter(anyObject())).thenReturn(7L);
+        when(resultSummary.statementType()).thenReturn(StatementType.READ_ONLY);
+        Map<String, Value> argumentMap = Values.parameters("Version", "3.1", "Planner", "COST", "Runtime", "INTERPRETED").asMap(v -> v);
+        when(plan.arguments()).thenReturn(argumentMap);
+
+        BoltResult result = new ListBoltResult(Collections.emptyList(), resultSummary);
+
+        // when
+        String actual = verbosePrinter.format(result);
+
+        // THEN
+        assertThat(actual, startsWith(String.join(NEWLINE,
+                                         "+--------------------------------------------------------------------+",
+                                         "| Plan      | Statement   | Version | Planner | Runtime       | Time |",
+                                         "+--------------------------------------------------------------------+",
+                                         "| \"EXPLAIN\" | \"READ_ONLY\" | \"3.1\"   | \"COST\"  | \"INTERPRETED\" | 12   |",
+                                          "+--------------------------------------------------------------------+",
+                                         NEWLINE)));
+    }
+
     @Test
     public void prettyPrintPoint() {
         // given