From 9215ae38cff3dfd8169d171c9516a59fbf265aab Mon Sep 17 00:00:00 2001
From: Jean-Pierre Bergamin <james@ractive.ch>
Date: Mon, 17 Oct 2011 13:52:30 +0200
Subject: [PATCH] Use platform independent line separators by using
 String.format("...%n...") in the documentation tests

---
 .../data/test/DocumentingTestBase.java        | 21 ++++++++++---------
 .../data/test/DocumentingTestBaseTest.java    | 14 ++++++-------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java
index a44f512c1e..11aa382af4 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java
@@ -19,6 +19,7 @@
 import org.junit.After;
 
 import java.io.*;
+import java.util.regex.Matcher;
 
 import static org.junit.Assert.fail;
 
@@ -59,13 +60,13 @@ protected File getSnippetFileName(File directory, String name) {
     }
 
     protected String createFooter() {
-        return "</section>\n";
+        return String.format("</section>%n");
     }
 
     protected String createHeader() {
-        return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<!DOCTYPE section PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\">\n" +
-                "<section>\n";
+        return String.format("<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n" +
+                "<!DOCTYPE section PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\">%n" +
+                "<section>%n");
     }
 
     protected String createTitle() {
@@ -81,10 +82,10 @@ protected String createText() {
     }
 
     protected String createSnippet() {
-        return String.format("<example>\n" +
-                "           <title>%s</title>\n" +
-                "           <programlisting language=\"java\"><![CDATA[%s]]></programlisting>\n" +
-                "       </example>\n", snippetTitle, collectSnippet());
+        return String.format("<example>%n" +
+                "           <title>%s</title>%n" +
+                "           <programlisting language=\"java\"><![CDATA[%s]]></programlisting>%n" +
+                "       </example>%n", snippetTitle, collectSnippet());
     }
 
     protected String collectSnippet() {
@@ -99,7 +100,7 @@ protected String collectSnippet() {
                     continue;
                 }
                 if (inSnippet) {
-                    snippetText.append(line).append("\n");
+                    snippetText.append(line).append(String.format("%n"));
                 }
             }
             reader.close();
@@ -110,7 +111,7 @@ protected String collectSnippet() {
     }
 
     protected File getJavaFile() {
-        final String javaFileName = getClass().getName().replaceAll("\\.", File.separator) + ".java";
+        final String javaFileName = getClass().getName().replaceAll("\\.", Matcher.quoteReplacement(File.separator)) + ".java";
         final File javaFile = new File(testSourceDirectory(), javaFileName);
         if (!javaFile.exists()) fail("Snippet File " + javaFile + " does not exist ");
         return javaFile;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java
index 6602b5edd8..89bfe4278c 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java
@@ -40,19 +40,19 @@ public class DocumentingTestBaseTest extends DocumentingTestBase {
 
     @Test
     public void testTitle() {
-        assertEquals("<title>Documents DocumentingTestBase</title>\n",createTitle());
+        assertEquals(String.format("<title>Documents DocumentingTestBase</title>%n"),createTitle());
     }
     @Test
     public void testParagraphs() {
-        assertEquals("<para>\nThis documents the documenting test base\n</para>\n"+
-                "<para>\nAnd this is a second paragraph\n</para>\n"
+        assertEquals(String.format("<para>%nThis documents the documenting test base%n</para>%n"+
+                "<para>%nAnd this is a second paragraph%n</para>%n")
                 ,createText());
     }
     @Test
     public void testCreateSnippet() {
-        assertEquals("    {\n" +
-                "        title=\"Documents DocumentingTestBase\";\n" +
-                "    }\n" +
-                "        snippetTitle = \"SnippetTitle\";\n",collectSnippet());
+        assertEquals(String.format("    {%n" +
+                "        title=\"Documents DocumentingTestBase\";%n" +
+                "    }%n" +
+                "        snippetTitle = \"SnippetTitle\";%n"),collectSnippet());
     }
 }