diff options
| author | Simon Steiner <ssteiner@apache.org> | 2023-04-04 14:03:17 +0100 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2023-04-04 14:03:17 +0100 |
| commit | aa9091d44d190a65b696f12f9d84cfe32524086d (patch) | |
| tree | a3d50604c0accc839cb58101b2df76c03d120053 | |
| parent | b7eeb45bea9fa9fbc462a338c84d65876da263c7 (diff) | |
| download | xmlgraphics-fop-aa9091d44d190a65b696f12f9d84cfe32524086d.tar.gz xmlgraphics-fop-aa9091d44d190a65b696f12f9d84cfe32524086d.zip | |
FOP-3127: Fix test
| -rw-r--r-- | fop-core/src/test/java/org/apache/fop/pdf/PDFPageXMPTestCase.java | 15 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFPageXMPTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFPageXMPTestCase.java index 870e85998..bd3886aa6 100644 --- a/fop-core/src/test/java/org/apache/fop/pdf/PDFPageXMPTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFPageXMPTestCase.java @@ -70,7 +70,8 @@ public class PDFPageXMPTestCase { public void textFO() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); foToOutput(out, MimeConstants.MIME_PDF); - Assert.assertTrue(out.toString().replace("\r", "").contains(XMP)); + String pdf = trimLines(out.toString()); + Assert.assertTrue(pdf, pdf.contains(XMP)); } @Test @@ -78,7 +79,17 @@ public class PDFPageXMPTestCase { ByteArrayOutputStream out = new ByteArrayOutputStream(); foToOutput(out, MimeConstants.MIME_FOP_IF); out = iFToPDF(new ByteArrayInputStream(out.toByteArray())); - Assert.assertTrue(out.toString().replace("\r", "").contains(XMP)); + String pdf = trimLines(out.toString()); + Assert.assertTrue(pdf, pdf.contains(XMP)); + } + + private String trimLines(String pdf) { + pdf = pdf.replace("\r", ""); + StringBuilder sb = new StringBuilder(); + for (String line : pdf.split("\n")) { + sb.append(line.trim()).append("\n"); + } + return sb.toString(); } private ByteArrayOutputStream iFToPDF(InputStream is) throws Exception { @@ -30,7 +30,7 @@ <surefire.plugin.version>2.18.1</surefire.plugin.version> <war.plugin.version>3.3.2</war.plugin.version> <xml.plugin.version>1.0.1</xml.plugin.version> - <xmlgraphics.commons.version>2.8.0-SNAPSHOT</xmlgraphics.commons.version> + <xmlgraphics.commons.version>2.9.0-SNAPSHOT</xmlgraphics.commons.version> <xmlunit.version>1.2</xmlunit.version> <jdk.path>${env.JAVA_HOME}</jdk.path> </properties> |