From 8138c7c426183f9e328f4205a71fbe600714273d Mon Sep 17 00:00:00 2001 From: Intelligent2013 Date: Fri, 23 Dec 2022 16:46:20 +0300 Subject: [PATCH 1/5] XSLT updated, set add_math_as_text to true, #129 --- src/test/resources/iec.international-standard.xsl | 2 +- src/test/resources/iso.international-standard.xsl | 2 +- src/test/resources/itu.recommendation.xsl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/resources/iec.international-standard.xsl b/src/test/resources/iec.international-standard.xsl index c05a69c7..87700edb 100644 --- a/src/test/resources/iec.international-standard.xsl +++ b/src/test/resources/iec.international-standard.xsl @@ -1935,7 +1935,7 @@ --> -falsefalsefalse +falsetruefalse diff --git a/src/test/resources/iso.international-standard.xsl b/src/test/resources/iso.international-standard.xsl index 7760c142..cd35da86 100644 --- a/src/test/resources/iso.international-standard.xsl +++ b/src/test/resources/iso.international-standard.xsl @@ -2076,7 +2076,7 @@ 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 -falsefalsefalse +falsetruefalse diff --git a/src/test/resources/itu.recommendation.xsl b/src/test/resources/itu.recommendation.xsl index 8840811b..eaad4c5e 100644 --- a/src/test/resources/itu.recommendation.xsl +++ b/src/test/resources/itu.recommendation.xsl @@ -2050,7 +2050,7 @@ -falsefalsefalse +falsetruefalse From 06c03d28b6acb48845cc975a859c3960cbe6e8b0 Mon Sep 17 00:00:00 2001 From: Intelligent2013 Date: Fri, 23 Dec 2022 21:29:24 +0300 Subject: [PATCH 2/5] method names added for tests, #129 --- src/test/java/org/metanorma/fop/mn2pdfTests.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/org/metanorma/fop/mn2pdfTests.java b/src/test/java/org/metanorma/fop/mn2pdfTests.java index 3886fdee..b5dc761c 100644 --- a/src/test/java/org/metanorma/fop/mn2pdfTests.java +++ b/src/test/java/org/metanorma/fop/mn2pdfTests.java @@ -36,6 +36,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.rules.TestName; import org.junit.contrib.java.lang.system.EnvironmentVariables; import org.junit.contrib.java.lang.system.ExpectedSystemExit; @@ -70,6 +71,7 @@ public class mn2pdfTests { @Rule public final EnvironmentVariables envVarRule = new EnvironmentVariables(); + @Rule public TestName name = new TestName(); @BeforeClass public static void setUpBeforeClass() throws Exception { @@ -93,6 +95,7 @@ public String getTestCapturedLog() throws IOException @Test public void notEnoughArguments() throws ParseException, IOException { + System.out.println(name.getMethodName()); exitRule.expectSystemExitWithStatus(-1); String[] args = new String[]{"1", "2", "3"}; mn2pdf.main(args); @@ -118,6 +121,7 @@ public void fopConfingNotExists() { @Test public void xmlNotExists() throws ParseException, IOException { + System.out.println(name.getMethodName()); exitRule.expectSystemExitWithStatus(-1); String fontpath = System.getProperty("buildDirectory") + File.separator + ".." + File.separator + "fonts"; @@ -133,6 +137,7 @@ public void xmlNotExists() throws ParseException, IOException { @Test public void xslNotExists() throws ParseException, IOException { + System.out.println(name.getMethodName()); exitRule.expectSystemExitWithStatus(-1); ClassLoader classLoader = getClass().getClassLoader(); @@ -165,6 +170,7 @@ public void missingEnvVariable() { }*/ @Test public void success() throws ParseException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("G.191.xml").getFile(); @@ -194,6 +200,7 @@ public void additionalXMLnotfound() throws ParseException, IOException { @Test public void successFontReplacement() throws ParseException, IOException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); @@ -220,6 +227,7 @@ public void successFontReplacement() throws ParseException, IOException { @Test public void successNonPDFUAmode() throws ParseException, IOException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("rice-en.svgtest.xml").getFile(); @@ -237,6 +245,7 @@ public void successNonPDFUAmode() throws ParseException, IOException { @Test public void checkResultedPDF() throws ParseException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("rice-en.final.metadata.xml").getFile(); @@ -296,6 +305,7 @@ public void checkResultedPDF() throws ParseException { @Test public void checkResultedEncryptedPDF() throws ParseException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("rice-en.final.metadata.xml").getFile(); @@ -355,6 +365,7 @@ public void checkResultedEncryptedPDF() throws ParseException { @Test public void testSyntaxHighlight() throws TransformerException, TransformerConfigurationException { + System.out.println(name.getMethodName()); String code = "text"; Node node = Util.syntaxHighlight(code, "xml"); StringWriter writer = new StringWriter(); @@ -367,6 +378,7 @@ public void testSyntaxHighlight() throws TransformerException, TransformerConfig @Test public void successSVGRendering() throws ParseException, IOException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("iso.svgtest.xml").getFile(); @@ -392,6 +404,7 @@ public void successSVGRendering() throws ParseException, IOException { @Test public void checkSpacesInPDF() throws ParseException { + System.out.println(name.getMethodName()); ClassLoader classLoader = getClass().getClassLoader(); String fontpath = Paths.get(System.getProperty("buildDirectory"), ".." , "fonts").toString(); String xml = classLoader.getResource("iso.zerowidthspacetest.xml").getFile(); @@ -414,6 +427,7 @@ public void checkSpacesInPDF() throws ParseException { @Test public void checkCSSparsing() throws IOException { + System.out.println(name.getMethodName()); String cssString = "sourcecode .c, sourcecode .ch {\n" + " color: #FF0000;\n" + "}"; @@ -437,6 +451,7 @@ private static String nodeToString(Node node) { @Test public void testDates() throws IOException { + System.out.println(name.getMethodName()); String date1 = "20180125T0121"; Calendar cdate1 = Util.getCalendarDate(date1); Calendar cdate1_etalon = Calendar.getInstance(); From 18d8b6d29ac6ad3e7980fc42e0085c59524bc419 Mon Sep 17 00:00:00 2001 From: Intelligent2013 Date: Fri, 23 Dec 2022 22:06:58 +0300 Subject: [PATCH 3/5] debug info added, #129 --- src/main/java/org/metanorma/fop/PDFGenerator.java | 1 + src/test/java/org/metanorma/fop/mn2pdfTests.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/metanorma/fop/PDFGenerator.java b/src/main/java/org/metanorma/fop/PDFGenerator.java index f99e13ba..a2798e6a 100644 --- a/src/main/java/org/metanorma/fop/PDFGenerator.java +++ b/src/main/java/org/metanorma/fop/PDFGenerator.java @@ -476,6 +476,7 @@ private void runFOP (fontConfig fontcfg, Source src, File pdf) throws IOExceptio debugXSLFO = xmlIF; debugSaveXML(xmlIF, pdf.getAbsolutePath() + ".if.mathtext.xml"); + System.out.println(xmlIF); } diff --git a/src/test/java/org/metanorma/fop/mn2pdfTests.java b/src/test/java/org/metanorma/fop/mn2pdfTests.java index b5dc761c..f47ba309 100644 --- a/src/test/java/org/metanorma/fop/mn2pdfTests.java +++ b/src/test/java/org/metanorma/fop/mn2pdfTests.java @@ -313,7 +313,7 @@ public void checkResultedEncryptedPDF() throws ParseException { String encryption_params = classLoader.getResource("pdf-encryption.yaml").getFile(); Path pdf = Paths.get(System.getProperty("buildDirectory"), "iso-rice.encrypted.pdf"); - String[] args = new String[]{"--font-path", fontpath, "--xml-file", xml, "--xsl-file", xsl, "--pdf-file", pdf.toAbsolutePath().toString(), "--encryption-parameters", encryption_params}; + String[] args = new String[]{"--font-path", fontpath, "--xml-file", xml, "--xsl-file", xsl, "--pdf-file", pdf.toAbsolutePath().toString(), "--encryption-parameters", encryption_params, "--debug"}; mn2pdf.main(args); // check pdf permissions From f3ce95653151a19d4bd4857f67fb8a71f1b115b2 Mon Sep 17 00:00:00 2001 From: Intelligent2013 Date: Sun, 25 Dec 2022 19:28:26 +0300 Subject: [PATCH 4/5] disable assert for tests, #129 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c50f0321..00709faa 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,7 @@ ${project.build.directory} + false From 333b71ac27e1eaf3d4ce3cfd945be107fca4deef Mon Sep 17 00:00:00 2001 From: Intelligent2013 Date: Sun, 25 Dec 2022 19:44:37 +0300 Subject: [PATCH 5/5] code cleaning, #129 --- src/main/java/org/metanorma/fop/PDFGenerator.java | 1 - src/test/java/org/metanorma/fop/mn2pdfTests.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/metanorma/fop/PDFGenerator.java b/src/main/java/org/metanorma/fop/PDFGenerator.java index a2798e6a..f99e13ba 100644 --- a/src/main/java/org/metanorma/fop/PDFGenerator.java +++ b/src/main/java/org/metanorma/fop/PDFGenerator.java @@ -476,7 +476,6 @@ private void runFOP (fontConfig fontcfg, Source src, File pdf) throws IOExceptio debugXSLFO = xmlIF; debugSaveXML(xmlIF, pdf.getAbsolutePath() + ".if.mathtext.xml"); - System.out.println(xmlIF); } diff --git a/src/test/java/org/metanorma/fop/mn2pdfTests.java b/src/test/java/org/metanorma/fop/mn2pdfTests.java index f47ba309..b5dc761c 100644 --- a/src/test/java/org/metanorma/fop/mn2pdfTests.java +++ b/src/test/java/org/metanorma/fop/mn2pdfTests.java @@ -313,7 +313,7 @@ public void checkResultedEncryptedPDF() throws ParseException { String encryption_params = classLoader.getResource("pdf-encryption.yaml").getFile(); Path pdf = Paths.get(System.getProperty("buildDirectory"), "iso-rice.encrypted.pdf"); - String[] args = new String[]{"--font-path", fontpath, "--xml-file", xml, "--xsl-file", xsl, "--pdf-file", pdf.toAbsolutePath().toString(), "--encryption-parameters", encryption_params, "--debug"}; + String[] args = new String[]{"--font-path", fontpath, "--xml-file", xml, "--xsl-file", xsl, "--pdf-file", pdf.toAbsolutePath().toString(), "--encryption-parameters", encryption_params}; mn2pdf.main(args); // check pdf permissions