From 475595847ca64d89f2feb915a9b2da731a8664c0 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Sat, 20 Feb 2021 02:37:53 +0000 Subject: [PATCH] 8262041: javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java fails after JDK-8260858 Reviewed-by: lancea, naoto --- test/jaxp/ProblemList.txt | 1 - .../xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/jaxp/ProblemList.txt b/test/jaxp/ProblemList.txt index f8d5788586678..23ebb07f5ffc0 100644 --- a/test/jaxp/ProblemList.txt +++ b/test/jaxp/ProblemList.txt @@ -23,4 +23,3 @@ # ########################################################################### -javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java 8262041 windows-all diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java index 2f59315ad7b01..083c0ff8ba585 100644 --- a/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java +++ b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java @@ -190,7 +190,7 @@ public void testIsStandalone_XSLTC(boolean pretty, boolean p, boolean sp, boolean val, String expected) throws Exception { String result = transform(null, expected, false, pretty, p, sp, val); - Assert.assertEquals(result, expected); + Assert.assertEquals(result.replaceAll("\r\n", "\n"), expected); } /* @@ -203,7 +203,7 @@ public void testIsStandalone_Template(String xsl, boolean pretty, boolean p, boolean sp, boolean val, String expected) throws Exception { String result = transform(xsl, expected, false, pretty, p, sp, val); - Assert.assertEquals(result, expected); + Assert.assertEquals(result.replaceAll("\r\n", "\n"), expected); } /*