svn commit: r1201115 - in /commons/sandbox/csv/trunk/src: main/java/org/apache/commons/csv/CSVFormat.java test/java/org/apache/commons/csv/CSVFormatTest.java test/java/org/apache/commons/csv/CSVPrinterTest.java

[eb...@apache.org]

Author: ebourg
Date: Sat Nov 12 00:16:56 2011
New Revision: 1201115

URL: http://svn.apache.org/viewvc?rev=1201115&view=rev
Log:
Changed the default line separator to \r\n to comply with RFC 4180 (SANDBOX-163)

Modified:
    commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java
    commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java
    commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java

Modified: commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java
URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java?rev=1201115&r1=1201114&r2=1201115&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java (original)
+++ commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVFormat.java Sat Nov 12 00:16:56 2011
@@ -34,7 +34,7 @@ public class CSVFormat implements Clonea
     private boolean trailingSpacesIgnored = true;
     private boolean unicodeEscapesInterpreted = false;
     private boolean emptyLinesIgnored = true;
-    private String lineSeparator = "\n";
+    private String lineSeparator = "\r\n";
 
 
     /**
@@ -45,7 +45,7 @@ public class CSVFormat implements Clonea
      */
     public static final char DISABLED = '\ufffe';
 
-    /** Standard comma separated format. */
+    /** Standard comma separated format as defined by RFC 4180. */
     public static final CSVFormat DEFAULT = new CSVFormat(',', '"', DISABLED, DISABLED, true, true, false, true);
 
     /** Excel file format (using a comma as the value delimiter). */

Modified: commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java?rev=1201115&r1=1201114&r2=1201115&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java (original)
+++ commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVFormatTest.java Sat Nov 12 00:16:56 2011
@@ -37,8 +37,8 @@ public class CSVFormatTest extends TestC
         assertEquals('!', format.getDelimiter());
         assertEquals('!', format.getEncapsulator());
         assertEquals('!', format.getCommentStart());
-        assertEquals("\n", format.getLineSeparator());
         assertEquals('!', format.getEscape());
+        assertEquals("\r\n", format.getLineSeparator());
         
         assertEquals(true, format.isLeadingSpacesIgnored());
         assertEquals(true, format.isTrailingSpacesIgnored());

Modified: commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java?rev=1201115&r1=1201114&r2=1201115&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java (original)
+++ commons/sandbox/csv/trunk/src/test/java/org/apache/commons/csv/CSVPrinterTest.java Sat Nov 12 00:16:56 2011
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
  */
 public class CSVPrinterTest extends TestCase {
 
-    String lineSeparator = "\n";
+    String lineSeparator = "\r\n";
 
     public void testPrinter1() throws IOException {
         StringWriter sw = new StringWriter();