diff --git a/build.gradle b/build.gradle index 4082237..e7947c1 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,9 @@ configurations{ bundledLibs } dependencies{ - testImplementation 'junit:junit:4.13' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1' + testImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0' bundledLibs 'org.libreoffice:jurt:5.3.2' bundledLibs 'org.libreoffice:juh:5.3.2' @@ -25,7 +27,6 @@ dependencies{ bundledLibs 'org.json:json:20190722' bundledLibs group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' bundledLibs group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3' - compile 'junit:junit:4.13' bundledLibs group: 'com.miglayout', name: 'miglayout-swing', version: '5.2' bundledLibs group: 'org.apache.jena', name: 'jena-core', version: '3.15.0' bundledLibs group: 'org.apache.jena', name: 'jena-arq', version: '3.15.0' @@ -203,7 +204,10 @@ task oxtNew(type: Zip){ } task regressionTests(type: Test){ - + useJUnit() + testLogging { + events "passed", "skipped", "failed" + } } task setVersion(){ diff --git a/src/test/java/w2phtml/regressionTests/TestExample.java b/src/test/java/w2phtml/regressionTests/TestExample.java index 12c9c6d..84c4864 100644 --- a/src/test/java/w2phtml/regressionTests/TestExample.java +++ b/src/test/java/w2phtml/regressionTests/TestExample.java @@ -1,20 +1,33 @@ package w2phtml.regressionTests; +import java.io.File; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + public class TestExample { + @Test + @DisplayName("Heading with page break before") public static void main(String[] args) throws Exception { - //long start = System.nanoTime(); + List arguments = new ArrayList(); arguments.add("-page_break_style"); arguments.add("height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"); arguments.add("-html5"); - arguments.add("/home/litvinovg/tmp/w2p-bug/test_5.odt"); + arguments.add("./testdocuments/input/heading_with_page_break_before.odt"); + arguments.add("./testdocuments/output/heading_with_page_break_before.html"); w2phtml.Application.main(arguments.toArray(new String[0])); - //long end = System.nanoTime(); - //long elapsedTime = end - start; - //System.out.println(elapsedTime/1000000); +// System.out.println("Working Directory = " + System.getProperty("user.dir")); + File result = new File("./testdocuments/output/heading_with_page_break_before.html"); + File model = new File("./testdocuments/model/heading_with_page_break_before.html"); +// System.out.println(result.exists()); +// System.out.println(model.exists()); + assertTrue( FileUtils.contentEquals(result, model),"The files differ!"); } } diff --git a/testdocuments/input/heading_with_page_break_before.odt b/testdocuments/input/heading_with_page_break_before.odt new file mode 100644 index 0000000..85959ed Binary files /dev/null and b/testdocuments/input/heading_with_page_break_before.odt differ diff --git a/testdocuments/model/heading_with_page_break_before.html b/testdocuments/model/heading_with_page_break_before.html new file mode 100644 index 0000000..8b99577 --- /dev/null +++ b/testdocuments/model/heading_with_page_break_before.html @@ -0,0 +1,24 @@ + + + + Default + + + + +
+
+

BEFORE HEADING

+
+
+
+
+
+

Heading

+

Tex

+
+
+ +