summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2023-05-24 09:24:18 +0200
committerMiklos Vajna <vmiklos@collabora.com>2023-05-24 10:17:57 +0200
commit2c43b3f88d71e9bcf73d2b3ac52bad55aa5b9a7a (patch)
tree57f91332b8425161f9d386053703b0e2d767c4a1
parent55cca83ca3544d3ae82d978b017899ced9833cc5 (diff)
CppunitTest_sw_uiwriter4: restore part of testTdf107975 on Windows
Just disable the part that in fact fails, as requested at <https://gerrit.libreoffice.org/c/core/+/152180/2#message-a9a5614df8b71f2b545ede872c5af9efa41a029b>. Change-Id: Ic856525505d25d7b443058e6e56151270c4c1244 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152181 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
-rw-r--r--sw/qa/extras/uiwriter/uiwriter4.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx
index f1b3336a8f6b..029c62191373 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2345,13 +2345,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf113877_blank_bold_on)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
{
-// Disable on Windows: fails quite a lot on multiple Jenkins slaves, but entirely reliably,
-// with:
-// sw/qa/extras/uiwriter/uiwriter4.cxx(2407) : error : Assertion
-// - Expected: 2
-// - Actual : 1
-// i.e. the xIndexAccess->getCount() line.
-#if !defined(_WIN32)
// This test also covers tdf#117185 tdf#110442
createSwDoc("tdf107975.odt");
@@ -2410,6 +2403,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf107975)
dispatchCommand(mxComponent, ".uno:GoRight", {});
dispatchCommand(mxComponent, ".uno:Paste", {});
+// Disable on Windows: fails quite a lot on multiple Jenkins slaves, but entirely reliably,
+// with:
+// sw/qa/extras/uiwriter/uiwriter4.cxx(2407) : error : Assertion
+// - Expected: 2
+// - Actual : 1
+// i.e. the xIndexAccess->getCount() line.
+#if !defined(_WIN32)
// without the fix, it crashes
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());