Adapt tests to windows line endings.

Author: fickludd

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

@@ -195,7 +195,7 @@ public void paramsAndListVariablesWithSpecialCharacters() throws CommandExceptio
     public void cypherWithOrder() throws CommandException {
         // given
         String serverVersion = shell.getServerVersion();
-        assumeTrue(minorVersion(serverVersion) >= 5 || majorVersion(serverVersion) == 4);
+        assumeTrue(minorVersion(serverVersion) == 6 || majorVersion(serverVersion) == 4);
 
         shell.execute( "CREATE INDEX ON :Person(age)" );
 

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

@@ -32,6 +32,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.neo4j.driver.internal.util.Iterables.map;
+import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
 
 @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
 public class PrettyPrinterTest {
@@ -144,13 +145,17 @@ public void prettyPrintList() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("col1, col2\n[\"val1_1\", \"val1_2\"], [\"val2_1\"]\n[\"val2_1\"]\n"));
+        assertThat(actual, is(String.join(NEWLINE,
+                "col1, col2",
+                "[\"val1_1\", \"val1_2\"], [\"val2_1\"]",
+                "[\"val2_1\"]",
+                "")));
     }
 
     @Test
     public void prettyPrintMaps() {
-        checkMapForPrettyPrint(map(), "map\n{}\n");
-        checkMapForPrettyPrint(map("abc", "def"), "map\n{abc: def}\n");
+        checkMapForPrettyPrint(map(), "map"+NEWLINE+"{}"+NEWLINE);
+        checkMapForPrettyPrint(map("abc", "def"), "map"+NEWLINE+"{abc: def}"+NEWLINE);
     }
 
     private void checkMapForPrettyPrint(Map<String, String> map, String expectedResult) {
@@ -200,8 +205,8 @@ public void prettyPrintNode() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("col1, col2\n" +
-                "(:label1:label2 {prop2: prop2_value, prop1: prop1_value})\n"));
+        assertThat(actual, is("col1, col2" + NEWLINE +
+                "(:label1:label2 {prop2: prop2_value, prop1: prop1_value})" + NEWLINE));
     }
 
     @Test
@@ -230,7 +235,8 @@ public void prettyPrintRelationships() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("rel\n[:RELATIONSHIP_TYPE {prop2: prop2_value, prop1: prop1_value}]\n"));
+        assertThat(actual, is("rel" + NEWLINE+
+                "[:RELATIONSHIP_TYPE {prop2: prop2_value, prop1: prop1_value}]" + NEWLINE));
     }
 
     @Test
@@ -272,8 +278,10 @@ public void printRelationshipsAndNodesWithEscapingForSpecialCharacters() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("rel, node\n[:`RELATIONSHIP,TYPE` {prop2: prop2_value, prop1: \"prop1, value\"}], " +
-                "(:`label ``1`:label2 {prop1: \"prop1:value\", `1prop2`: \"\", ä: not-escaped})\n"));
+        assertThat(actual, is(
+                "rel, node" + NEWLINE +
+                "[:`RELATIONSHIP,TYPE` {prop2: prop2_value, prop1: \"prop1, value\"}], " +
+                "(:`label ``1`:label2 {prop1: \"prop1:value\", `1prop2`: \"\", ä: not-escaped})" + NEWLINE));
     }
 
     @Test
@@ -331,9 +339,9 @@ public void prettyPrintPaths() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("path\n" +
+        assertThat(actual, is("path" + NEWLINE +
                 "(:start {prop1: prop1_value})-[:RELATIONSHIP_TYPE]->" +
-                "(:middle)<-[:RELATIONSHIP_TYPE]-(:end {prop2: prop2_value})\n"));
+                "(:middle)<-[:RELATIONSHIP_TYPE]-(:end {prop2: prop2_value})" + NEWLINE));
     }
 
     @Test
@@ -375,7 +383,7 @@ public void prettyPrintSingleNodePath() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("path\n(:start)-[:RELATIONSHIP_TYPE]->(:end)\n"));
+        assertThat(actual, is("path" + NEWLINE + "(:start)-[:RELATIONSHIP_TYPE]->(:end)" + NEWLINE));
     }
 
     @Test
@@ -435,8 +443,8 @@ public void prettyPrintThreeSegmentPath() {
         String actual = plainPrinter.format(result);
 
         // then
-        assertThat(actual, is("path\n" +
+        assertThat(actual, is("path" + NEWLINE +
                 "(:start)-[:RELATIONSHIP_TYPE]->" +
-                "(:second)<-[:RELATIONSHIP_TYPE]-(:third)-[:RELATIONSHIP_TYPE]->(:end)\n"));
+                "(:second)<-[:RELATIONSHIP_TYPE]-(:third)-[:RELATIONSHIP_TYPE]->(:end)" + NEWLINE));
     }
 }

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

@@ -39,6 +39,7 @@
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
 
 @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
 public class TableOutputFormatterTest {
@@ -290,19 +291,20 @@ public void wrapContent()
         new TableOutputFormatter(true, 2).format(new ListBoltResult(result.list(), result.summary()), printer);
         String table = printer.result();
         // THEN
-        assertThat(table, is(
-                "+------+\n" +
-                "| c1   |\n" +
-                "+------+\n" +
-                "| \"a\"  |\n" +
-                "| \"bb\" |\n" +
-                "| \"ccc |\n" +
-                "| \"    |\n" +
-                "| \"ddd |\n" +
-                "| d\"   |\n" +
-                "| \"eee |\n" +
-                "| ee\"  |\n" +
-                "+------+\n"));
+        assertThat(table, is(String.join(NEWLINE,
+                "+------+",
+                "| c1   |",
+                "+------+",
+                "| \"a\"  |",
+                "| \"bb\" |",
+                "| \"ccc |",
+                "| \"    |",
+                "| \"ddd |",
+                "| d\"   |",
+                "| \"eee |",
+                "| ee\"  |",
+                "+------+",
+                "")));
     }
 
     @Test
@@ -315,16 +317,17 @@ public void truncateContent()
         new TableOutputFormatter(false, 2).format(new ListBoltResult(result.list(), result.summary()), printer);
         String table = printer.result();
         // THEN
-        assertThat(table, is(
-                "+------+\n" +
-                "| c1   |\n" +
-                "+------+\n" +
-                "| \"a\"  |\n" +
-                "| \"bb\" |\n" +
-                "| \"cc… |\n" +
-                "| \"dd… |\n" +
-                "| \"ee… |\n" +
-                "+------+\n"));
+        assertThat(table, is(String.join(NEWLINE,
+                "+------+",
+                "| c1   |",
+                "+------+",
+                "| \"a\"  |",
+                "| \"bb\" |",
+                "| \"cc… |",
+                "| \"dd… |",
+                "| \"ee… |",
+                "+------+",
+                "")));
     }
 
     @Test