From 7ef256b4b287af758d5bad0912de7140a4f69fbf Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 9 Sep 2025 09:59:10 +0100 Subject: Test reading of table cells when non-cells are present --- .../zwobble/mammoth/tests/docx/BodyXmlTests.java | 31 ++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) 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 74a4e71..ef5262a 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -1579,14 +1579,41 @@ public class BodyXmlTests { @Test public void warningIfNonCellInTableRow() { + // Include normal cells to ensure they're still read correctly. XmlElement element = element("w:tbl", list( - wTr(element("w:p")) + wTr( + element("w:tc", list( + element("w:p", list( + runXml("Cell 1") + )) + )), + element("w:p"), + element("w:tc", list( + element("w:p", list( + runXml("Cell 2") + )) + )) + ) )); assertThat( read(bodyReader(), element), isInternalResult( - deepEquals(table(list(tableRow(list(paragraph()))))), + deepEquals(table(list( + tableRow(list( + tableCell(withChildren( + paragraph(withChildren( + runWithText("Cell 1") + )) + )), + paragraph(), + tableCell(withChildren( + paragraph(withChildren( + runWithText("Cell 2") + )) + )) + )) + ))), list("unexpected non-cell element in table row, cell merging may be incorrect") ) ); -- cgit v1.2.3