diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java new file mode 100644 index 0000000..98238ac --- /dev/null +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.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 ListInSection { + @Test + @DisplayName("List in section") + void testExample() throws Exception { + String testName = "list_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/src/r_tests/java/w2phtml/regressionTests/html5/ListInTableInSection.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListInTableInSection.java new file mode 100644 index 0000000..3230b1a --- /dev/null +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ListInTableInSection.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 ListInTableInSection { + @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/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java b/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java index 6064784..62ac538 100644 --- a/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java +++ b/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java @@ -13,17 +13,17 @@ import org.junit.jupiter.api.Test; public class PageSectionStyles { @Test @DisplayName("Page styles and sections") - void testExample() throws Exception{ - String testName = "image_after_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!"); -} + void testExample() throws Exception { + String testName = "image_after_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_section.odt b/testdocuments/input/list_in_section.odt new file mode 100644 index 0000000..b49c6aa Binary files /dev/null and b/testdocuments/input/list_in_section.odt differ diff --git a/testdocuments/input/list_in_table_in_section.html b/testdocuments/input/list_in_table_in_section.html new file mode 100644 index 0000000..0a1ed61 --- /dev/null +++ b/testdocuments/input/list_in_table_in_section.html @@ -0,0 +1,213 @@ + + + + Default + + + + +
+
+ + + + + + + + + + + +
+

 

+ 		+

2text text text text text text text text text text text text2

+
+
+
+
+
+
+

PAGE 1

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

 

+ 		+

3text text text text text text text text text text text text3

+
+
+
+
+
+
+

PAGE 2

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

 

+ 		+

4text text text text text text text text

+
+
+
+
+
+
+

PAGE 3

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

 

+

  • List first line

  • text text text text text text text tex1

+
+
+
+
+
+

PAGE 4

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

 

+ 		+

5text text 5

+
+
+
+
+
+
+

PAGE 5

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

 

+

  •  text text text text4  

+
+
+
+
+
+

PAGE 6

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

 

+ 		+ 
+

 

+ 		+

 

+
+
    +
  • +

    Numbering list 2

    +
    • +
+
+
+
+
+

Heading 1

+
+
+
+
+
+

PAGE 7

+
+
+ + diff --git a/testdocuments/input/list_in_table_in_section.odt b/testdocuments/input/list_in_table_in_section.odt new file mode 100644 index 0000000..2387cf7 Binary files /dev/null and b/testdocuments/input/list_in_table_in_section.odt differ diff --git a/testdocuments/model/list_in_section.html b/testdocuments/model/list_in_section.html new file mode 100644 index 0000000..86fc04b --- /dev/null +++ b/testdocuments/model/list_in_section.html @@ -0,0 +1,64 @@ + + + + Default + + + + +
+
+
    +
  • +

    List first

    +
    • +
  • +

    text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text 1tex

    +
    • +
+
+
+
+
+
+

PAGE 1

+
+
+
+
+
+

2ext text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text

+
+
+
+
+
+

PAGE 2

+
+
+
+
+
+

3ext text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text

+
    +
  • +

    text

    +
    • +
+
+
+
+
+

Heading 1

+
+
+
+
+ +
+ +