svn commit: r1917267 - /poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java

[centic]

Author: centic
Date: Mon Apr 22 13:16:10 2024
New Revision: 1917267

URL: http://svn.apache.org/viewvc?rev=1917267&view=rev
Log:
Adjust test for XLS2CSV for different newlines on Windows

Modified:
    
poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java

Modified: 
poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java?rev=1917267&r1=1917266&r2=1917267&view=diff
==============================================================================
--- 
poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java
 (original)
+++ 
poi/trunk/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java
 Mon Apr 22 13:16:10 2024
@@ -53,7 +53,7 @@ class TestXLS2CSVmra {
 
         outStream.flush();
 
-        assertEquals("\n"
+        assertEquals(sanitize("\n"
                 + "First Sheet [1]:\n"
                 + "\"Test spreadsheet\"\n"
                 + "\"2nd row\",\"2nd row 2nd column\"\n"
@@ -69,7 +69,7 @@ class TestXLS2CSVmra {
                 + "\"cb=1\",\"cb=10\",\"cb=2\",\"cb=sum\"\n"
                 + "1,10,2,13\n"
                 + "\n"
-                + "Sheet3 [3]:\n", new String(outStream.toByteArray(), 
StandardCharsets.UTF_8));
+                + "Sheet3 [3]:\n"), sanitize(new 
String(outStream.toByteArray(), StandardCharsets.UTF_8)));
     }
 
     @Test
@@ -85,12 +85,12 @@ class TestXLS2CSVmra {
 
         outStream.flush();
 
-        assertEquals("\n"
+        assertEquals(sanitize("\n"
                 + "Лист1 [1]:\n"
                 + "\n"
                 + "Лист2 [2]:\n"
                 + "\n"
-                + "Лист3 [3]:\n", new String(outStream.toByteArray(), 
StandardCharsets.UTF_8));
+                + "Лист3 [3]:\n"), sanitize(new 
String(outStream.toByteArray(), StandardCharsets.UTF_8)));
 
 
         NumberRecord record = new NumberRecord();
@@ -100,12 +100,16 @@ class TestXLS2CSVmra {
 
         outStream.flush();
 
-        assertEquals("\n"
+        assertEquals(sanitize("\n"
                 + "Лист1 [1]:\n"
                 + "\n"
                 + "Лист2 [2]:\n"
                 + "\n"
                 + "Лист3 [3]:\n"
-                + "1.243", new String(outStream.toByteArray(), 
StandardCharsets.UTF_8));
+                + "1.243"), sanitize(new String(outStream.toByteArray(), 
StandardCharsets.UTF_8)));
+    }
+
+    private String sanitize(String str) {
+        return str.replace("\r\n", "\n");
     }
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org