diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-03-01 10:12:15 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-03-10 10:32:19 +0100 |
| commit | bfb19a4ec7c43680358fe81e33bdfcb0ca47c91c (patch) | |
| tree | 359b6f5ff9f645a54eae59399ede632f9f525160 | |
| parent | cd60a2d31737f491088cfb0789bc014b1e0aad5f (diff) | |
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.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit da77aec27e3121c895a6c6c287225216489cc8bc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131024
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 5fbecf5be3c1..f48117661d9c 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -1280,29 +1280,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(); } @@ -1318,24 +1316,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(); } |