diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java index 98238ac..60e93cb 100644 --- a/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java @@ -14,16 +14,18 @@ public class ListInSection { @Test @DisplayName("List in section") void testExample() throws Exception { - String testName = "list_in_section"; + String name = "list_in_section"; + 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/" + testName + ".odt"); - arguments.add("./testdocuments/output/" + testName + ".html"); + 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/" + testName + ".html"); - File model = new File("./testdocuments/model/" + testName + ".html"); + 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/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java b/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java index 3230b1a..9399d78 100644 --- a/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java @@ -10,11 +10,11 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -public class ListInTableInSection { +public class ListInTable { @Test - @DisplayName("list in table in section") + @DisplayName("list in table") void testExample() throws Exception { - String testName = "list_in_table_in_section"; + String testName = "list_in_table"; List arguments = new ArrayList(); arguments.add("-page_break_style"); arguments.add("height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"); diff --git a/testdocuments/input/list_in_table_in_section.html b/testdocuments/model/list_in_table_in_section.html similarity index 71% rename from testdocuments/input/list_in_table_in_section.html rename to testdocuments/model/list_in_table_in_section.html index 0a1ed61..ac87c20 100644 --- a/testdocuments/input/list_in_table_in_section.html +++ b/testdocuments/model/list_in_table_in_section.html @@ -20,9 +20,7 @@

 

- -

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

- +

  • List first line

  • text text text text text text text tex1

@@ -34,8 +32,35 @@

PAGE 1

-
+
+
+ + + + + + + + + + + +
+

 

+ 		+

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

+
+
+
+
+
+
+

PAGE 2

+
+
+
+
@@ -55,40 +80,13 @@
-
-
-
-

PAGE 2

-
-
-
-
-
- - - - - - - - - - - -
-

 

- 		-

4text text text text text text text text

-
-
-

PAGE 3

-
+
@@ -101,7 +99,7 @@ - +

 

  • List first line

  • text text text text text text text tex1

4text text text text text text text text

  •  text text text text4  
@@ -113,7 +111,7 @@

PAGE 4

-
+
@@ -130,57 +128,6 @@

5text text 5

- -
-
-
-
-
-
-

PAGE 5

-
-
-
-
-
- - - - - - - - - - - -
-

 

-

  •  text text text text4  

-
-
-
-
-
-

PAGE 6

-
-
-
-
-
- - - - - - - - - -
-

 

- 		- 

 

@@ -198,15 +145,15 @@ -
+

Heading 1

-
+