From: Dominik Stadler Date: Sun, 5 Feb 2017 22:34:09 +0000 (+0000) Subject: Adjust for JDK 9 ea152 and newer: certain whitespaces in XML may now be trimmed X-Git-Tag: REL_3_16_FINAL~123 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4dc0379d1cc0f93a304829d872bedbb20e799433;p=poi.git Adjust for JDK 9 ea152 and newer: certain whitespaces in XML may now be trimmed git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1781821 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java index b2f4082999..12c37bc6b7 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java @@ -16,71 +16,66 @@ ==================================================================== */ package org.apache.poi.hwpf.converter; -import static org.apache.poi.POITestCase.assertContains; -import static org.junit.Assert.assertFalse; - -import java.io.StringWriter; +import org.apache.poi.POIDataSamples; +import org.apache.poi.hwpf.HWPFDocument; +import org.apache.poi.hwpf.usermodel.PictureType; +import org.apache.poi.util.XMLHelper; +import org.junit.Test; +import org.w3c.dom.Document; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import java.io.StringWriter; -import org.apache.poi.POIDataSamples; -import org.apache.poi.hwpf.HWPFDocument; -import org.apache.poi.hwpf.usermodel.PictureType; -import org.apache.poi.util.XMLHelper; -import org.junit.Test; -import org.w3c.dom.Document; +import static org.apache.poi.POITestCase.assertContains; +import static org.junit.Assert.assertFalse; /** * Test cases for {@link WordToHtmlConverter} */ -public class TestWordToHtmlConverter -{ - private static String getHtmlText( final String sampleFileName ) - throws Exception - { - return getHtmlText( sampleFileName, false); +public class TestWordToHtmlConverter { + private static String getHtmlText(final String sampleFileName) throws Exception { + return getHtmlText(sampleFileName, false); } - private static String getHtmlText( final String sampleFileName, - boolean emulatePictureStorage ) throws Exception - { - HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples - .getDocumentInstance().openResourceAsStream( sampleFileName )); + private static String getHtmlText(final String sampleFileName, + boolean emulatePictureStorage) throws Exception { + HWPFDocument hwpfDocument = new HWPFDocument(POIDataSamples + .getDocumentInstance().openResourceAsStream(sampleFileName)); Document newDocument = XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument(); WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter( newDocument); - if ( emulatePictureStorage ) + if (emulatePictureStorage) { - wordToHtmlConverter.setPicturesManager( new PicturesManager() + wordToHtmlConverter.setPicturesManager(new PicturesManager() { @Override - public String savePicture( byte[] content, + public String savePicture(byte[] content, PictureType pictureType, String suggestedName, - float widthInches, float heightInches ) + float widthInches, float heightInches) { return suggestedName; } }); } - wordToHtmlConverter.processDocument( hwpfDocument); + wordToHtmlConverter.processDocument(hwpfDocument); StringWriter stringWriter = new StringWriter(); Transformer transformer = TransformerFactory.newInstance() .newTransformer(); - transformer.setOutputProperty( OutputKeys.INDENT, "yes"); - transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8"); - transformer.setOutputProperty( OutputKeys.METHOD, "html"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.ENCODING, "utf-8"); + transformer.setOutputProperty(OutputKeys.METHOD, "html"); transformer.transform( - new DOMSource( wordToHtmlConverter.getDocument() ), - new StreamResult( stringWriter )); + new DOMSource(wordToHtmlConverter.getDocument()), + new StreamResult(stringWriter)); return stringWriter.toString(); } @@ -88,14 +83,14 @@ public class TestWordToHtmlConverter @Test public void testAIOOBTap() throws Exception { - String result = getHtmlText( "AIOOB-Tap.doc"); - assertContains(result.substring( 0, 6000 ), ""); + String result = getHtmlText("AIOOB-Tap.doc"); + assertContains(result.substring(0, 6000), "
"); } @Test public void testBug33519() throws Exception { - String result = getHtmlText( "Bug33519.doc"); + String result = getHtmlText("Bug33519.doc"); assertContains( result, "\u041F\u043B\u0430\u043D\u0438\u043D\u0441\u043A\u0438 \u0442\u0443\u0440\u043E\u0432\u0435"); @@ -106,7 +101,7 @@ public class TestWordToHtmlConverter @Test public void testBug46610_2() throws Exception { - String result = getHtmlText( "Bug46610_2.doc"); + String result = getHtmlText("Bug46610_2.doc"); assertContains( result, "012345678911234567892123456789312345678941234567890123456789112345678921234567893123456789412345678"); @@ -115,7 +110,7 @@ public class TestWordToHtmlConverter @Test public void testBug46817() throws Exception { - String result = getHtmlText( "Bug46817.doc"); + String result = getHtmlText("Bug46817.doc"); final String substring = "
"; assertContains(result, substring); } @@ -123,9 +118,9 @@ public class TestWordToHtmlConverter @Test public void testBug47286() throws Exception { - String result = getHtmlText( "Bug47286.doc"); + String result = getHtmlText("Bug47286.doc"); - assertFalse(result.contains( "FORMTEXT" )); + assertFalse(result.contains("FORMTEXT")); assertContains(result, "color:#4f6228;"); assertContains(result, "Passport No and the date of expire"); @@ -135,13 +130,13 @@ public class TestWordToHtmlConverter @Test public void testBug48075() throws Exception { - getHtmlText( "Bug48075.doc"); + getHtmlText("Bug48075.doc"); } @Test public void testBug52583() throws Exception { - String result = getHtmlText( "Bug52583.doc"); + String result = getHtmlText("Bug52583.doc"); assertContains( result, ""); @@ -150,14 +145,14 @@ public class TestWordToHtmlConverter @Test public void testBug53182() throws Exception { - String result = getHtmlText( "Bug53182.doc"); - assertFalse(result.contains( "italic" )); + String result = getHtmlText("Bug53182.doc"); + assertFalse(result.contains("italic")); } @Test public void testDocumentProperties() throws Exception { - String result = getHtmlText( "documentProperties.doc"); + String result = getHtmlText("documentProperties.doc"); assertContains(result, "This is document title"); assertContains(result, @@ -167,7 +162,7 @@ public class TestWordToHtmlConverter @Test public void testEmailhyperlink() throws Exception { - String result = getHtmlText( "Bug47286.doc"); + String result = getHtmlText("Bug47286.doc"); final String substring = "provisastpet@mfa.gov.cy"; assertContains(result, substring); } @@ -175,21 +170,22 @@ public class TestWordToHtmlConverter @Test public void testEndnote() throws Exception { - String result = getHtmlText( "endingnote.doc"); + String result = getHtmlText("endingnote.doc"); assertContains( result, "1"); assertContains( - result, - "1 1"); } @@ -197,7 +193,7 @@ public class TestWordToHtmlConverter @Test public void testHyperlink() throws Exception { - String result = getHtmlText( "hyperlink.doc"); + String result = getHtmlText("hyperlink.doc"); assertContains(result, "Before text; "); assertContains(result, ""); @@ -247,7 +243,7 @@ public class TestWordToHtmlConverter @Test public void testPicture() throws Exception { - String result = getHtmlText( "picture.doc", true); + String result = getHtmlText("picture.doc", true); // picture assertContains(result, "src=\"0.emf\""); @@ -262,7 +258,7 @@ public class TestWordToHtmlConverter @Test public void testPicturesEscher() throws Exception { - String result = getHtmlText( "pictures_escher.doc", true); + String result = getHtmlText("pictures_escher.doc", true); assertContains(result, ""); assertContains(result, ""); } @@ -270,7 +266,7 @@ public class TestWordToHtmlConverter @Test public void testTableMerges() throws Exception { - String result = getHtmlText( "table-merges.doc"); + String result = getHtmlText("table-merges.doc"); assertContains(result, "
"); assertContains(result, ""); @@ -278,9 +274,9 @@ public class TestWordToHtmlConverter @Test public void testBug52420() throws Exception { - String result = getHtmlText( "52420.doc"); + String result = getHtmlText("52420.doc"); - assertFalse(result.contains( "FORMTEXT" )); + assertFalse(result.contains("FORMTEXT")); assertContains(result, "\u0417\u0410\u0414\u0410\u041d\u0418\u0415"); assertContains(result, "\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c");