From 41eba5bac8c27f855caddb15a5df83e8518ebf43 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Tue, 5 Sep 2017 14:48:21 +0300 Subject: [PATCH] REPO-2872: fix HtmlParserContentTransformerTest.testEncodingHandling() test failing when run locally on systems other than Linux --- .../HtmlParserContentTransformerTest.java | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java b/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java index f7648aba84..3647b69e50 100644 --- a/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java +++ b/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java @@ -76,18 +76,24 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer /** * Checks that we correctly handle text in different encodings, * no matter if the encoding is specified on the Content Property - * or in a meta tag within the HTML itself. (ALF-10466) + * or in a meta tag within the HTML itself. (ALF-10466) + * + * On Windows, org.htmlparser.beans.StringBean.carriageReturn() appends a new system dependent new line + * so we must be careful when checking the returned text */ public void testEncodingHandling() throws Exception - { + { + final String NEWLINE = System.getProperty ("line.separator"); final String TITLE = "Testing!"; final String TEXT_P1 = "This is some text in English"; final String TEXT_P2 = "This is more text in English"; final String TEXT_P3 = "C'est en Fran\u00e7ais et Espa\u00f1ol"; - String partA = ""+TITLE+""; - String partB = "\n

"+TEXT_P1+"

\n" + - "

"+TEXT_P2+"

\n" + "

"+TEXT_P3+"

\n"; + String partA = "" + TITLE + "" + NEWLINE; + String partB = "

" + TEXT_P1 + "

" + NEWLINE + + "

" + TEXT_P2 + "

" + NEWLINE + + "

" + TEXT_P3 + "

" + NEWLINE; String partC = ""; + final String expected = TITLE + NEWLINE + TEXT_P1 + NEWLINE + TEXT_P2 + NEWLINE + TEXT_P3 + NEWLINE; ContentWriter content; ContentWriter dest; @@ -108,10 +114,8 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); transformer.transform(content.getReader(), dest); - assertEquals( - TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n", - dest.getReader().getContentString() - ); + + assertEquals(expected, dest.getReader().getContentString()); tmpS.delete(); tmpD.delete(); @@ -128,10 +132,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); transformer.transform(content.getReader(), dest); - assertEquals( - TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n", - dest.getReader().getContentString() - ); + assertEquals(expected, dest.getReader().getContentString()); tmpS.delete(); tmpD.delete(); @@ -148,10 +149,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); transformer.transform(content.getReader(), dest); - assertEquals( - TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n", - dest.getReader().getContentString() - ); + assertEquals(expected, dest.getReader().getContentString()); tmpS.delete(); tmpD.delete(); @@ -178,10 +176,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); transformer.transform(content.getReader(), dest); - assertEquals( - TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n", - dest.getReader().getContentString() - ); + assertEquals(expected, dest.getReader().getContentString()); tmpS.delete(); tmpD.delete();