From 6aeeed4b54be723de189fc68ad130d217b42cfa5 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 12 Mar 2021 20:54:42 +0100 Subject: [PATCH] New test added --- .../w2phtml/pageSplitters/ListSplitter.java | 4 +- .../regressionTests/html5/BulletList.java | 31 +++++++++++++++ testdocuments/input/list.odt | Bin 0 -> 12009 bytes testdocuments/model/list.html | 37 ++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java create mode 100644 testdocuments/input/list.odt create mode 100644 testdocuments/model/list.html diff --git a/src/main/java/w2phtml/pageSplitters/ListSplitter.java b/src/main/java/w2phtml/pageSplitters/ListSplitter.java index bd80e16..20fe791 100644 --- a/src/main/java/w2phtml/pageSplitters/ListSplitter.java +++ b/src/main/java/w2phtml/pageSplitters/ListSplitter.java @@ -79,7 +79,9 @@ public class ListSplitter extends BasicSplitter implements ISplitter { //Debug.prettyPrintXml(list.getOwnerDocument()); ((Element) list).setAttribute(TEXT_CONTINUE_NUMBERING, "true"); parent.insertBefore(listFirstPart, list); - //parent.insertBefore(softPageBreak, list); + if (isRootElement(list)) { + parent.insertBefore(softPageBreak, list); + } results.setSPB(softPageBreak); // System.out.println("LIST FIRST PART"); // Debug.printNode(listFirstPart); diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java b/src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java new file mode 100644 index 0000000..af9fef7 --- /dev/null +++ b/src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java @@ -0,0 +1,31 @@ +package w2phtml.regressionTests.html5; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class BulletList { + @Test + @DisplayName("List on multiple pages") + void testExample() throws Exception { + String name = "list"; + File input = new File("./testdocuments/input/" + name + ".odt"); + assertTrue(input.exists()); + 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("./testdocuments/input/" + name + ".odt"); + arguments.add("./testdocuments/output/" + name + ".html"); + w2phtml.Application.main(arguments.toArray(new String[0])); + File result = new File("./testdocuments/output/" + name + ".html"); + File model = new File("./testdocuments/model/" + name + ".html"); + assertTrue(FileUtils.contentEquals(result, model), "The files differ!"); + } +} diff --git a/testdocuments/input/list.odt b/testdocuments/input/list.odt new file mode 100644 index 0000000000000000000000000000000000000000..33677d224a10cba5c3fa6617dbeaa33590f8ec60 GIT binary patch literal 12009 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 literal 0 HcmV?d00001 diff --git a/testdocuments/model/list.html b/testdocuments/model/list.html new file mode 100644 index 0000000..b944d08 --- /dev/null +++ b/testdocuments/model/list.html @@ -0,0 +1,37 @@ + + + + Default + + + + +
+
+
    +
  • +

    Text text

    +
    • +
+
+
+
+
+
+
    +
  • +

    text adfa

    +
    • +
+
+
+
+
+
+

fadfasdf

+
+
+ +