diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-20 09:21:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-13 14:44:07 +0200 |
| commit | 64f35d448621778d54affcb3a70aee5fd5fd8d4d (patch) | |
| tree | 5d0fe0972b160299750f27ffa569cb6c0cffdc6b | |
| parent | bf9a67ee8178fcee51dbaceef4496585be1c34b9 (diff) | |
tdf#108524 sw: add split section in table testcase
And if we're at it, test the other way around as well, I almost broke
it.
Reviewed-on: https://gerrit.libreoffice.org/38999
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e9d2016648c7fdfc57932ac0793547cf099749be)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Ia81e46f218336e5db13dafdbad7b896d8dadaf46
| -rw-r--r-- | sw/qa/extras/uiwriter/data/table-in-sect.odt | bin | 0 -> 11744 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/data/tdf108524.odt | bin | 0 -> 9053 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 30 |
3 files changed, 30 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/table-in-sect.odt b/sw/qa/extras/uiwriter/data/table-in-sect.odt Binary files differnew file mode 100644 index 000000000000..f439edef997e --- /dev/null +++ b/sw/qa/extras/uiwriter/data/table-in-sect.odt diff --git a/sw/qa/extras/uiwriter/data/tdf108524.odt b/sw/qa/extras/uiwriter/data/tdf108524.odt Binary files differnew file mode 100644 index 000000000000..d8978b269cab --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf108524.odt diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 8186316b3742..77d7894e1454 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -253,6 +253,8 @@ public: void testTdf107976(); void testTdf113790(); void testParagraphOfTextRange(); + void testTdf108524(); + void testTableInSection(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); @@ -393,6 +395,8 @@ public: CPPUNIT_TEST(testTdf107976); CPPUNIT_TEST(testTdf113790); CPPUNIT_TEST(testParagraphOfTextRange); + CPPUNIT_TEST(testTdf108524); + CPPUNIT_TEST(testTableInSection); CPPUNIT_TEST_SUITE_END(); private: @@ -5046,6 +5050,32 @@ void SwUiWriterTest::testParagraphOfTextRange() CPPUNIT_ASSERT_EQUAL(OUString("In section"), xParagraph->getString()); } +void SwUiWriterTest::testTdf108524() +{ + createDoc("tdf108524.odt"); + xmlDocPtr pXmlDoc = parseLayoutDump(); + // In total we expect two cells containing a section. + assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/section", 2); + + assertXPath(pXmlDoc, "/root/page[1]/body/tab/row/cell/section", 1); + // This was 0, section wasn't split, instead it was only on the first page + // and it was cut off. + assertXPath(pXmlDoc, "/root/page[2]/body/tab/row/cell/section", 1); +} + +void SwUiWriterTest::testTableInSection() +{ + // The document has a section, containing a table that spans over 2 pages. + createDoc("table-in-sect.odt"); + xmlDocPtr pXmlDoc = parseLayoutDump(); + // In total we expect 4 cells. + assertXPath(pXmlDoc, "/root/page/body/section/tab/row/cell", 4); + + // Assert that on both pages the section contains 2 cells. + assertXPath(pXmlDoc, "/root/page[1]/body/section/tab/row/cell", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/row/cell", 2); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); |