You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/05/14 23:53:19 UTC
svn commit: r1679464 -
/pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
Author: tilman
Date: Thu May 14 21:53:18 2015
New Revision: 1679464
URL: http://svn.apache.org/r1679464
Log:
PDFBOX-2792: remove CRs for equality test
Modified:
pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
Modified: pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java?rev=1679464&r1=1679463&r2=1679464&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java Thu May 14 21:53:18 2015
@@ -26,7 +26,6 @@ import java.io.LineNumberReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.Iterator;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -442,19 +441,19 @@ public class TestTextStripper extends Te
"First level 1\n"
+ "First level 2\n"
+ "Fist level 3\n"
- + "Some content\r\n"
- + "Some other content\r\n"
+ + "Some content\n"
+ + "Some other content\n"
+ "Second at level 1\n"
+ "Second level 2\n"
- + "Content\r\n"
+ + "Content\n"
+ "Third level 1\n"
+ "Third level 2\n"
+ "Third level 3\n"
- + "Content\r\n"
+ + "Content\n"
+ "Fourth level 1\n"
- + "Content\r\n"
- + "Content\r\n";
- assertEquals(expectedTextFull, textFull);
+ + "Content\n"
+ + "Content\n";
+ assertEquals(expectedTextFull, textFull.replaceAll("\r", ""));
// this should grab 0-based pages 2 and 3, i.e. 1-based pages 3 and 4
// by their bookmarks
@@ -467,12 +466,12 @@ public class TestTextStripper extends Te
String expectedTextoi23 =
"Second at level 1\n"
+ "Second level 2\n"
- + "Content\r\n"
+ + "Content\n"
+ "Third level 1\n"
+ "Third level 2\n"
+ "Third level 3\n"
- + "Content\r\n";
- assertEquals(expectedTextoi23, textoi23);
+ + "Content\n";
+ assertEquals(expectedTextoi23, textoi23.replaceAll("\r", ""));
// this should grab 0-based pages 2 and 3, i.e. 1-based pages 3 and 4
// by their page numbers
@@ -498,8 +497,8 @@ public class TestTextStripper extends Te
String expectedTextoi2 =
"Second at level 1\n"
+ "Second level 2\n"
- + "Content\r\n";
- assertEquals(expectedTextoi2, textoi2);
+ + "Content\n";
+ assertEquals(expectedTextoi2, textoi2.replaceAll("\r", ""));
// this should grab 0-based page 2, i.e. 1-based page 3