From 89f2807f4e3ea849ad7c0289d6841172089171c5 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 12 Mar 2021 18:53:27 +0100 Subject: [PATCH] Added test list in table --- ...InTableInSection.java => ListInTable.java} | 0 .../html5/ListTableSection.java | 29 +++++++++++ testdocuments/input/list_in_table.odt | Bin 0 -> 12365 bytes testdocuments/model/list_in_table.html | 48 ++++++++++++++++++ 4 files changed, 77 insertions(+) rename src/r_tests/java/w2phtml/regressionTests/html5/{ListInTableInSection.java => ListInTable.java} (100%) create mode 100644 src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java create mode 100644 testdocuments/input/list_in_table.odt create mode 100644 testdocuments/model/list_in_table.html diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListInTableInSection.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java similarity index 100% rename from src/r_tests/java/w2phtml/regressionTests/html5/ListInTableInSection.java rename to src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java new file mode 100644 index 0000000..5e98b01 --- /dev/null +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java @@ -0,0 +1,29 @@ +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 ListTableSection { + @Test + @DisplayName("list in table in section") + void testExample() throws Exception { + String testName = "list_in_table_in_section"; + 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/" + testName + ".odt"); + arguments.add("./testdocuments/output/" + testName + ".html"); + w2phtml.Application.main(arguments.toArray(new String[0])); + File result = new File("./testdocuments/output/" + testName + ".html"); + File model = new File("./testdocuments/model/" + testName + ".html"); + assertTrue(FileUtils.contentEquals(result, model), "The files differ!"); + } +} diff --git a/testdocuments/input/list_in_table.odt b/testdocuments/input/list_in_table.odt new file mode 100644 index 0000000000000000000000000000000000000000..91d0d09eb9a356b96b70844a056879069d62dacd GIT binary patch literal 12365 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 + + + Default + + + + +

+
+ + + + + + + + + +
  • text tex1

+
+
+
+
+
+ + + + + + + + + +
+

2ext text

+
+
    +
  • +

     

    +
  • +
+
+
+ +