diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-06-04 15:57:22 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-06-04 15:57:22 +0100 |
| commit | b5a83b1cb96d410e325ff8b733d550295376d8c7 (patch) | |
| tree | 449d44f1e2bc1f7bbad6a3bb98a0002ffe0e9d17 /src/test/java/org/zwobble | |
| parent | c264e80c9d01289398d67b31307bc4d7eca27739 (diff) | |
Write rowspan attribute to HTML
Diffstat (limited to 'src/test/java/org/zwobble')
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java | 16 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java | 3 |
2 files changed, 18 insertions, 1 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 1555a86..6c1ccbe 100644 --- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java @@ -243,6 +243,22 @@ public class DocumentToHtmlTests { } @Test + public void tableCellsAreWrittenWithRowspanIfNotEqualToOne() { + assertThat( + convertToHtml(new Table(list( + new TableRow(list( + make(a(TABLE_CELL, with(ROWSPAN, 2))) + )) + ))), + deepEquals(list(Html.element("table", list( + Html.element("tr", list( + Html.element("td", map("rowspan", "2"), list(Html.FORCE_WRITE)) + )) + )))) + ); + } + + @Test public void hyperlinkWithHrefIsConvertedToAnchorTag() { assertThat( convertToHtml(Hyperlink.href("http://example.com", list(new Text("Hello")))), 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 17cd18e..0fefd26 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -24,6 +24,7 @@ DocumentElementMakers { public static final Property<Run, VerticalAlignment> VERTICAL_ALIGNMENT = newProperty(); public static final Property<HasChildren, List<DocumentElement>> CHILDREN = newProperty(); public static final Property<TableCell, Integer> COLSPAN = newProperty(); + public static final Property<TableCell, Integer> ROWSPAN = newProperty(); public static final Instantiator<Paragraph> PARAGRAPH = propertyLookup -> new Paragraph( @@ -43,7 +44,7 @@ DocumentElementMakers { public static final Instantiator<TableCell> TABLE_CELL = propertyLookup -> new TableCell( - 1, + propertyLookup.valueOf(ROWSPAN, 1), propertyLookup.valueOf(COLSPAN, 1), propertyLookup.valueOf(CHILDREN, list())); |