From b7b82920c28c71deea8b043417a6f8e445c4e46e Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sat, 26 Oct 2019 19:14:35 +0000 Subject: [PATCH] Two more tests which are failing in CI on Windows git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1869014 13f79535-47bb-0310-9956-ffa450edef68 --- src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java | 3 +-- src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java b/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java index 3b05780575..96083e4d84 100644 --- a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java +++ b/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java @@ -34,7 +34,6 @@ public final class TestEscherBoolProperty { "\t, \"flags\": 383 /* */ \n" + "\t, \"value\": 1\n" + "}"; - expected = expected.replace("\n", System.getProperty("line.separator")); - assertEquals(expected, p.toString()); + assertEquals(expected, p.toString().replace("\r", "")); } } diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java index a8735a068e..c3d07958ed 100644 --- a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java +++ b/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java @@ -68,8 +68,7 @@ public final class TestEscherDgRecord { "\t, \"lastMSOSPID\": 1025 /* 0x00000401 */\n" + "\t, \"drawingGroupId\": 1\n" + "}"; - expected = expected.replace("\n", System.getProperty("line.separator")); - assertEquals( expected, createRecord().toString() ); + assertEquals( expected, createRecord().toString().replace("\r", "") ); } private static EscherDgRecord createRecord()