From 7d96c9aee67b7de9f8acd5139f34bfdb9f01f798 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 9 Sep 2025 09:56:57 +0100 Subject: Test reading of table rows when non-rows are present --- .../zwobble/mammoth/tests/docx/BodyXmlTests.java | 39 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) (limited to 'src/test/java/org') 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 2c8c96c..74a4e71 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -1531,14 +1531,47 @@ public class BodyXmlTests { @Test public void warningIfNonRowInTable() { + // Include normal rows to ensure they're still read correctly. XmlElement element = element("w:tbl", list( - element("w:p") + element("w:tr", list( + element("w:tc", list( + element("w:p", list( + runXml("Row 1") + )) + )) + )), + element("w:p"), + element("w:tr", list( + element("w:tc", list( + element("w:p", list( + runXml("Row 2") + )) + )) + )) )); + InternalResult result = read(bodyReader(), element); + assertThat( - read(bodyReader(), element), + result, isInternalResult( - deepEquals(table(list(paragraph()))), + deepEquals(table(list( + tableRow(list( + tableCell(withChildren( + paragraph(withChildren( + runWithText("Row 1") + )) + )) + )), + paragraph(), + tableRow(list( + tableCell(withChildren( + paragraph(withChildren( + runWithText("Row 2") + )) + )) + )) + ))), list("unexpected non-row element in table, cell merging may be incorrect") ) ); -- cgit v1.2.3