diff options
Diffstat (limited to 'src/test/java/org')
3 files changed, 66 insertions, 16 deletions
diff --git a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java index 6155f5a..7b12085 100644 --- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java @@ -240,7 +240,7 @@ public class DocumentToHtmlTests { @Test public void tableIsConvertedToHtmlTable() { assertThat( - convertToHtml(new Table(list( + convertToHtml(table(list( tableRow(list( tableCell(withChildren(paragraphWithText("Top left"))), tableCell(withChildren(paragraphWithText("Top right"))))), @@ -260,7 +260,7 @@ public class DocumentToHtmlTests { @Test public void headerRowsAreWrappedInThead() { assertThat( - convertToHtml(new Table(list( + convertToHtml(table(list( tableRow(list(tableCell()), withIsHeader(true)), tableRow(list(tableCell()), withIsHeader(true)), tableRow(list(tableCell()), withIsHeader(false)) @@ -281,7 +281,7 @@ public class DocumentToHtmlTests { @Test public void tbodyIsOmittedIfAllRowsAreHeaders() { assertThat( - Html.stripEmpty(convertToHtml(new Table(list( + Html.stripEmpty(convertToHtml(table(list( tableRow(list(tableCell()), withIsHeader(true)) )))), @@ -296,7 +296,7 @@ public class DocumentToHtmlTests { @Test public void tableCellsAreWrittenWithColspanIfNotEqualToOne() { assertThat( - convertToHtml(new Table(list( + convertToHtml(table(list( tableRow(list( tableCell( withChildren(paragraphWithText("Top left")), @@ -316,7 +316,7 @@ public class DocumentToHtmlTests { @Test public void tableCellsAreWrittenWithRowspanIfNotEqualToOne() { assertThat( - convertToHtml(new Table(list( + convertToHtml(table(list( tableRow(list( tableCell(withRowspan(2)) )) diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java index 4bff04d..0289bdb 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -122,6 +122,10 @@ public class DocumentElementMakers { return run(withChildren(new Text(text))); } + public static Table table(List<DocumentElement> rows) { + return new Table(Optional.empty(), rows); + } + public static TableRow tableRow(List<DocumentElement> cells, Object... args) { Arguments arguments = new Arguments(args); return new TableRow(cells, arguments.get(IS_HEADER, false)); diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java index b6f8842..0695ece 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -628,13 +628,59 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( - tableRow(list( + isTable(hasChildren( + deepEquals(tableRow(list( new TableCell(1, 1, list( paragraph() )) - )) - ))) + ))) + )) + ); + } + + @Test + public void tableHasNoStyleIfItHasNoProperties() { + XmlElement element = element("w:tbl"); + assertThat( + readSuccess(bodyReader(), element), + hasStyle(Optional.empty()) + ); + } + + @Test + public void whenTableHasStyleIdInStylesThenStyleNameIsReadFromStyles() { + XmlElement element = element("w:tbl", list( + element("w:tblPr", list( + element("w:tblStyle", map("w:val", "TableNormal")) + )) + )); + + Style style = new Style("TableNormal", Optional.of("Normal Table")); + Styles styles = new Styles( + map(), + map(), + map("TableNormal", style) + ); + assertThat( + readSuccess(bodyReader(styles), element), + hasStyle(Optional.of(style)) + ); + } + + @Test + public void warningIsEmittedWhenTableStyleCannotBeFound() { + XmlElement element = element("w:tbl", list( + element("w:tblPr", list( + element("w:tblStyle", map("w:val", "TableNormal")) + )) + )); + + assertThat( + read(bodyReader(), element), + isInternalResult( + hasStyle(Optional.of(new Style("TableNormal", Optional.empty()))), + list("Table style with ID TableNormal was referenced but not defined in the document") + ) ); } @@ -670,7 +716,7 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( + deepEquals(table(list( tableRow(list( new TableCell(1, 2, list( paragraph() @@ -692,7 +738,7 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( + deepEquals(table(list( tableRow(list(new TableCell(1, 1, list()))), tableRow(list(new TableCell(3, 1, list()))), tableRow(list()), @@ -711,7 +757,7 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( + deepEquals(table(list( tableRow(list(new TableCell(2, 1, list()))), tableRow(list()) ))) @@ -729,7 +775,7 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( + deepEquals(table(list( tableRow(list(new TableCell(1, 1, list()), new TableCell(1, 1, list()), new TableCell(3, 1, list()))), tableRow(list(new TableCell(1, 2, list()))), tableRow(list(new TableCell(1, 1, list()), new TableCell(1, 1, list()))), @@ -747,7 +793,7 @@ public class BodyXmlTests { assertThat( readSuccess(bodyReader(), element), - deepEquals(new Table(list( + deepEquals(table(list( tableRow(list(new TableCell(1, 2, list()), new TableCell(1, 1, list()))), tableRow(list(new TableCell(1, 1, list()), new TableCell(1, 1, list()))) ))) @@ -763,7 +809,7 @@ public class BodyXmlTests { assertThat( read(bodyReader(), element), isInternalResult( - deepEquals(new Table(list(paragraph()))), + deepEquals(table(list(paragraph()))), list("unexpected non-row element in table, cell merging may be incorrect") ) ); @@ -778,7 +824,7 @@ public class BodyXmlTests { assertThat( read(bodyReader(), element), isInternalResult( - deepEquals(new Table(list(tableRow(list(paragraph()))))), + deepEquals(table(list(tableRow(list(paragraph()))))), list("unexpected non-cell element in table row, cell merging may be incorrect") ) ); |