Dealing with Windows end of line characters in the test.

neo4j · Jul 7, 2016 · 4d38b70 · 4d38b70
1 parent d250ee3
commit 4d38b70
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java
@@ -142,7 +142,7 @@ public void makeSureCoreClusterCanBeRestoredFromABackup() throws Throwable
         TestStoreId storeId = TestStoreId.readStoreId( dbPaths.get( 0 ), fs );
 
         // when
-        StringBuilder output = RestoreClusterUtils.execute( () -> {
+        String output = RestoreClusterUtils.execute( () -> {
             File homeDir = cluster.getCoreServerById( 0 ).homeDir();
             RestoreNewClusterCli.main( toArray( args().homeDir( homeDir ).config( homeDir ).from( backupPath )
                     .database( "graph.db" ).force().build() ) );

diff --git a/...prise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java b/...prise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java
@@ -91,7 +91,7 @@ public void shouldReplicateTransactionToCoreServers() throws Throwable
 
         File homeDir = cluster.getCoreServerById( 0 ).homeDir();
 
-        StringBuilder output = RestoreClusterUtils.execute( () -> RestoreNewClusterCli.main( toArray( args()
+        String output = RestoreClusterUtils.execute( () -> RestoreNewClusterCli.main( toArray( args()
                 .homeDir( homeDir ).config( homeDir ).from( classicNeo4jStore )
                 .database( "graph.db" ).force().build() ) ) );
 

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java b/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java
@@ -75,7 +75,7 @@ public void shouldRestoreDatabase() throws Throwable
         LinkedList<String> args = ArgsBuilder.args().homeDir( homeDir ).config( homeDir )
                 .from( classicNeo4jStore ).database( "graph.db" ).build() ;
 
-        StringBuilder out = RestoreClusterUtils.execute( () -> RestoreNewClusterCli.main( args.toArray( new String[args.size()] ) ) );
+        String out = RestoreClusterUtils.execute( () -> RestoreNewClusterCli.main( args.toArray( new String[args.size()] ) ) );
 
         // then
         String seed = extractSeed( out );
@@ -118,9 +118,9 @@ private StoreMetadata metadataFor( File classicNeo4jStore ) throws IOException
         }
     }
 
-    public static String extractSeed( StringBuilder builder )
+    public static String extractSeed( String message )
     {
-        return builder.toString().replace( "Cluster Seed: ", "" ).replace( "\n", "" );
+        return message.replace( "Cluster Seed: ", "" ).trim();
     }
 
     private File createClassicNeo4jStore( File base, int nodesToCreate, String recordFormat )

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterUtils.java b/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterUtils.java
@@ -25,14 +25,14 @@
 
 public class RestoreClusterUtils
 {
-    public static StringBuilder execute( Runnable function )
+    public static String execute(Runnable function )
     {
         StringBuilder builder = new StringBuilder();
         PrintStream theRealOut = System.out;
         System.setOut( new PrintStream( new MyOutputStream( builder ) ) );
         function.run();
         System.setOut( theRealOut );
-        return builder;
+        return builder.toString();
     }
 
     private static class MyOutputStream extends OutputStream