sw/qa/extras/layout/layout.cxx | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
New commits:
commit da77aec27e3121c895a6c6c287225216489cc8bc
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Mar 1 10:12:15 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Mar 1 10:47:07 2022 +0100
Fix flaky test on Win64
Obviously the left values are unstable; they were excluded on macOS,
and they fail exactly on the same lines for me locally on Win64 build.
So just test that the values are restored after delete and undo.
Change-Id: I63dc50d223edb052a0ada200189cef94c2e0f8e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130738
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 0888e6c493ce..49b53b8b790e 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1270,29 +1270,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf143239)
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf143239-1-min.odt");
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+ // These are unstable on macOS and Win64 builds,
+ // so only test that they restore original values for now
+ OUString p2txt1Left, p2txt2Left, p3txt1Left;
+
{
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
"18540");
-#ifndef MACOSX
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
- "3559");
-#endif
+ p2txt1Left
+ = getXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "left");
assertXPath(pXmlDoc, "/root/page[2]/body/txt[2]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "top",
"23894");
-#ifndef MACOSX
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "left",
- "1964");
-#endif
+ p2txt2Left
+ = getXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "left");
assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
"35662");
-#ifndef MACOSX
- assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
- "3129");
-#endif
+ p3txt1Left
+ = getXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "left");
assertXPath(pXmlDoc, "/root/page", 3);
discardDumpedLayout();
}
@@ -1308,24 +1306,18 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf143239)
assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
"18540");
-#ifndef MACOSX
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
- "3559");
-#endif
+ p2txt1Left);
assertXPath(pXmlDoc, "/root/page[2]/body/txt[2]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "top",
"23894");
-#ifndef MACOSX
assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "left",
- "1964");
-#endif
+ p2txt2Left);
assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored/fly", 1);
assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
"35662");
-#ifndef MACOSX
assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
- "3129");
-#endif
+ p3txt1Left);
assertXPath(pXmlDoc, "/root/page", 3);
discardDumpedLayout();
}
