From 8ef4c1bf331ccbefe54e225748e7c11a467a68e7 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sun, 13 Oct 2019 09:29:36 +0000 Subject: [PATCH] Fix line.separator issues git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1868386 13f79535-47bb-0310-9956-ffa450edef68 --- src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java | 2 +- .../org/apache/poi/ddf/TestEscherContainerRecord.java | 5 ++++- src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java b/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java index 5cf82068a7..8b47a299f4 100644 --- a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java +++ b/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java @@ -107,7 +107,7 @@ public final class TestEscherBSERecord { "\t, blipRecord: null\n" + "\t, remainingData: \"\"\n" + "}"; - + expected = expected.replace("\n", System.getProperty("line.separator")); String actual = record.toString(); assertEquals( expected, actual ); } diff --git a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java index 350f99d9da..83244e8273 100644 --- a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java +++ b/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java @@ -90,6 +90,7 @@ public final class TestEscherContainerRecord { "\t, recordSize: 8\n" + "\t, isContainer: true\n" + "}"; + expected = expected.replace("\n", System.getProperty("line.separator")); assertEquals(expected, r.toString()); EscherOptRecord r2 = new EscherOptRecord(); @@ -119,7 +120,8 @@ public final class TestEscherContainerRecord { "\t\t}\n" + "\t]\n" + "}"; - assertEquals(expected, r.toString()); + expected = expected.replace("\n", System.getProperty("line.separator")); + assertEquals(expected, r.toString()); r.addChildRecord(r2); expected = @@ -154,6 +156,7 @@ public final class TestEscherContainerRecord { "\t\t}\n" + "\t]\n" + "}"; + expected = expected.replace("\n", System.getProperty("line.separator")); assertEquals(expected, r.toString()); } diff --git a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java index 5a293a293c..96c57e6ec6 100644 --- a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java +++ b/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java @@ -165,6 +165,7 @@ public final class TestEscherOptRecord { "\t\t, value: 1\n" + "\t}]\n" + "}"; + expected = expected.replace("\n", System.getProperty("line.separator")); assertEquals( expected, r.toString()); } -- 2.39.5