inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2872: fix HtmlParserContentTransformerTest.testEncodingHandling() test failing when run locally on systems other than Linux

Browse Source
This commit is contained in:
Andrei Rebegea
2017-09-05 14:48:21 +03:00
parent 4cbacecada
commit 41eba5bac8
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java
View File

@@ -77,17 +77,23 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
* Checks that we correctly handle text in different encodings, * Checks that we correctly handle text in different encodings,
* no matter if the encoding is specified on the Content Property * 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 public void testEncodingHandling() throws Exception
{ {
final String NEWLINE = System.getProperty ("line.separator");
final String TITLE = "Testing!"; final String TITLE = "Testing!";
final String TEXT_P1 = "This is some text in English"; final String TEXT_P1 = "This is some text in English";
final String TEXT_P2 = "This is more 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"; final String TEXT_P3 = "C'est en Fran\u00e7ais et Espa\u00f1ol";
String partA = "<html><head><title>"+TITLE+"</title>"; String partA = "<html><head><title>" + TITLE + "</title></head>" + NEWLINE;
String partB = "</head>\n<body><p>"+TEXT_P1+"</p>\n" + String partB = "<body><p>" + TEXT_P1 + "</p>" + NEWLINE +
"<p>"+TEXT_P2+"</p>\n" + "<p>"+TEXT_P3+"</p>\n"; "<p>" + TEXT_P2 + "</p>" + NEWLINE +
"<p>" + TEXT_P3 + "</p>" + NEWLINE;
String partC = "</body></html>"; String partC = "</body></html>";
final String expected = TITLE + NEWLINE + TEXT_P1 + NEWLINE + TEXT_P2 + NEWLINE + TEXT_P3 + NEWLINE;
ContentWriter content; ContentWriter content;
ContentWriter dest; ContentWriter dest;
@@ -108,10 +114,8 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest); transformer.transform(content.getReader(), dest);
assertEquals(
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n", assertEquals(expected, dest.getReader().getContentString());
dest.getReader().getContentString()
);
tmpS.delete(); tmpS.delete();
tmpD.delete(); tmpD.delete();
@@ -128,10 +132,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest); transformer.transform(content.getReader(), dest);
assertEquals( assertEquals(expected, dest.getReader().getContentString());
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
tmpS.delete(); tmpS.delete();
tmpD.delete(); tmpD.delete();
@@ -148,10 +149,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest); transformer.transform(content.getReader(), dest);
assertEquals( assertEquals(expected, dest.getReader().getContentString());
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
tmpS.delete(); tmpS.delete();
tmpD.delete(); tmpD.delete();
@@ -178,10 +176,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest); transformer.transform(content.getReader(), dest);
assertEquals( assertEquals(expected, dest.getReader().getContentString());
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
tmpS.delete(); tmpS.delete();
tmpD.delete(); tmpD.delete();