sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 255d208501be212416d161ad6c9a168d9f241573
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Sep 1 20:37:33 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Sep 2 08:26:42 2022 +0200
CppunitTest_sw_ooxmlimport: use more SwParaPortion::dumpAsXml()
See commit feeed3e762cf077fbd9cf48f82e949365108ccc1
(CppunitTest_sw_layoutwriter: avoid some a11y-based layout testing,
2022-04-07) for motivation.
Change-Id: I93878ccb1d754f1e9a8cfc93557b6d5fa6fa9fca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139231
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7cfdcb84a909..9b6bb5e7c08c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -386,13 +386,13 @@ CPPUNIT_TEST_FIXTURE(Test, testN758883)
* to the numbering. This is easier to test using a layout dump.
*/
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
- assertXPath(pXmlDoc, "/root/page/body/txt/Special[1]", "nHeight", "220");
+ assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwFieldPortion[1]",
"font-height", "220");
// check the bookmark portions are of the expected height
- assertXPath(pXmlDoc, "/root/page/body/txt/Special[2]", "nType",
"PortionType::Bookmark");
- assertXPath(pXmlDoc, "/root/page/body/txt/Special[2]", "nHeight", "253");
- assertXPath(pXmlDoc, "/root/page/body/txt/Special[3]", "nType",
"PortionType::Bookmark");
- assertXPath(pXmlDoc, "/root/page/body/txt/Special[3]", "nHeight", "253");
+ assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Bookmark");
+ assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion[1]", "height",
"253");
+ assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion[3]", "type",
"PortionType::Bookmark");
+ assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion[3]", "height",
"253");
/*
* Next problem was that the page margin contained the width of the page
border as well.
@@ -1789,7 +1789,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf136952_pgBreak3)
//Do not lose the page::breakAfter. This SHOULD be on page 4, but sadly it
is not.
//The key part of this test is that the page starts with "Lorem ipsum"
//Prior to this, there was no page break, and so it was in the middle of a
page.
- CPPUNIT_ASSERT(getXPath(pDump, "//page[6]/body/txt[1]/Text[1]",
"Portion").startsWith("Lorem ipsum"));
+ CPPUNIT_ASSERT(getXPath(pDump,
"//page[6]/body/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
"portion").startsWith("Lorem ipsum"));
}
