diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-02-21 14:07:38 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-02-21 20:20:29 +0000 |
commit | d52b97175b02745c1d9afab03256419bbebdf48d (patch) | |
tree | 597c57707b578d08e9d6c5a90e17c00ff1a666bd /sw | |
parent | 88e29df0c216c300b9388ee2822003da2bee8679 (diff) |
qa: call ProcessEventsToIdle inside dispatchCommand
Change-Id: I909e6f334f4a659282141a97ccb3ffdea6ecc364
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147397
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/layout/layout.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 4 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter2.cxx | 16 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter3.cxx | 99 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter4.cxx | 10 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter5.cxx | 14 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter6.cxx | 16 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter7.cxx | 3 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter8.cxx | 96 |
11 files changed, 0 insertions, 264 deletions
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx index e412c8249a65..235a5ccaf757 100644 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx @@ -334,7 +334,6 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend) // Undo second change dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("He heard quiet steps behind him. "), getParagraph(1)->getString()); CPPUNIT_ASSERT_EQUAL(OUString("That didn't bode well. Who could be following him this late at " @@ -351,7 +350,6 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend) // Undo first change dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), pDoc->getOnlineAccessibilityCheck()->getNumberOfAccessibilityIssues()); CPPUNIT_ASSERT_EQUAL( diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 4b8236f51b72..b706858237d3 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3704,7 +3704,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testKeepWithNextPlusFlyFollowTextFlow) } dispatchCommand(mxComponent, ".uno:Fieldnames", {}); - Scheduler::ProcessEventsToIdle(); { xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -3722,7 +3721,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testKeepWithNextPlusFlyFollowTextFlow) } dispatchCommand(mxComponent, ".uno:Fieldnames", {}); - Scheduler::ProcessEventsToIdle(); { xmlDocUniquePtr pXmlDoc = parseLayoutDump(); diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 87766434689a..bc11df124418 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1252,7 +1252,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReordering) // When view 1 presses undo: SfxLokHelper::setView(nView1); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // Then make sure view 1's last undo action is invoked, out of order: // Without the accompanying fix in place, this test would have failed with: @@ -1302,11 +1301,9 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingRedo) // When view 1 presses undo, twice: SfxLokHelper::setView(nView1); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // First just s(econd) is erased: CPPUNIT_ASSERT_EQUAL(OUString("f"), pTextNode1->GetText()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // Then make sure view 1's undo actions are invoked, out of order: // Without the accompanying fix in place, this test would have failed with: @@ -1356,7 +1353,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingMulti) // When view 1 presses undo: SfxLokHelper::setView(nView1); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // Then make sure view 1's undo action is invoked, out of order: // Without the accompanying fix in place, this test would have failed with: diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 5e047aedb789..d9ded7755c9f 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1488,7 +1488,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf137532) CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(xCursor, "CharWeight")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); xCursor.set(xText->createTextCursorByRange(getRun(getParagraph(1), 1))); CPPUNIT_ASSERT(xCursor.is()); @@ -1500,7 +1499,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf137532) CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(xCursor, "CharWeight")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); xCursor.set(xText->createTextCursorByRange(getRun(getParagraph(1), 1))); CPPUNIT_ASSERT(xCursor.is()); diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 763bfbb1e34d..84a7502191d0 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -445,7 +445,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250) // this would crash in 2 different ways dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -455,13 +454,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250) xTextContent->getAnchor()->getString()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -469,7 +466,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250) xTextContent->getAnchor()->getString()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -505,14 +501,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436) // first, the section doesn't get deleted dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -520,14 +514,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436) // second, the section does get deleted because point is at the end dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount()); CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -535,21 +527,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436) // the problem was that the section was not deleted on Redo dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount()); CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); CPPUNIT_ASSERT_EQUAL(OUString("a\nb\n"), pWrtShell->GetCursor()->GetText()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount()); @@ -580,7 +569,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252) xCursor->getString()); dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); @@ -588,7 +576,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252) // this would crash dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSections->getCount()); @@ -596,14 +583,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252) xCursor->getString()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); CPPUNIT_ASSERT_EQUAL(OUString(""), xCursor->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSections->getCount()); @@ -611,7 +596,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252) xCursor->getString()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index 4cc56c2342ba..d8ce0a3c7be8 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -47,17 +47,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145731) CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(9, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -70,36 +67,29 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147199) CPPUNIT_ASSERT_EQUAL(7, getShapes()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(7, getShapes()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(14, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(7, getShapes()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(7, getShapes()); } @@ -111,16 +101,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139843) int nPages = getPages(); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(nPages, getPages()); } @@ -131,10 +118,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848) createSwDoc("tdf77014.odt"); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XEnumerationAccess> xFieldsAccess( @@ -144,7 +129,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848) // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); xFields = xFieldsAccess->createEnumeration(); @@ -165,29 +149,24 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf149507) CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -198,7 +177,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf114973) createSwDoc("tdf114973.fodt"); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); SwDoc* const pDoc = getSwDoc(); SwWrtShell* const pWrtShell = pDoc->GetDocShell()->GetWrtShell(); @@ -206,18 +184,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf114973) CPPUNIT_ASSERT(!pWrtShell->IsInHeaderFooter()); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); // check that hidden paragraphs at start and end are deleted dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(int(1), getParagraphs()); CPPUNIT_ASSERT_EQUAL(OUString(), getParagraph(1)->getString()); // check that hidden paragraphs at start and end are copied dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(int(3), getParagraphs()); CPPUNIT_ASSERT_EQUAL(OUString("hidden first paragraph"), getParagraph(1)->getString()); @@ -235,17 +210,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145321) CPPUNIT_ASSERT_EQUAL(3, getPages()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(3, getShapes()); CPPUNIT_ASSERT_EQUAL(3, getPages()); @@ -696,15 +668,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138482) CPPUNIT_ASSERT_EQUAL(2, getShapes()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(2, getShapes()); } @@ -720,16 +689,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134965) for (sal_Int32 i = 0; i < 10; ++i) { dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); } @@ -747,11 +713,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128375) CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed cutting the second document dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); } @@ -768,15 +732,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135061) CPPUNIT_ASSERT_EQUAL(4, getShapes()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); for (sal_Int32 i = 0; i < 5; ++i) { dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); } CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xIndexAccess->getCount()); @@ -786,7 +747,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135061) { // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); } CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); @@ -828,12 +788,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911) CPPUNIT_ASSERT_EQUAL(8, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(4, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(0, getShapes()); @@ -848,18 +806,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911) CPPUNIT_ASSERT_EQUAL(8, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(4, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(0, getShapes()); //tdf#135247: Without the fix in place, this would have crashed dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(4, getShapes()); } @@ -911,7 +866,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf124904) // remove the first word "Heading" (with change tracking) to update the referenced text dispatchCommand(mxComponent, ".uno:DelToEndOfWord", {}); - Scheduler::ProcessEventsToIdle(); // This was "Reference to Heading of document file" CPPUNIT_ASSERT_EQUAL(OUString("Reference to of example document "), @@ -919,7 +873,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf124904) // don't hide the wholly deleted referenced text dispatchCommand(mxComponent, ".uno:DelToEndOfLine", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("Reference to Heading of example document file"), getParagraph(2)->getString()); } @@ -952,22 +905,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134404) CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:InsertPagebreak", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(2, getPages()); dispatchCommand(mxComponent, ".uno:SwBackspace", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, the image would have been deleted CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(2, getPages()); } @@ -996,15 +945,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132321) CPPUNIT_ASSERT_EQUAL(1, getShapes()); dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SwBackspace", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, the button form would have also been deleted CPPUNIT_ASSERT_EQUAL(1, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); } @@ -1048,11 +994,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132597) { { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -1076,11 +1020,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139737) { { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf150845) @@ -1092,7 +1034,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf150845) uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } })); dispatchCommand(mxComponent, ".uno:Edit", aArgs); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); } @@ -1213,7 +1154,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf144840) { { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); @@ -1248,7 +1188,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963) { { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here @@ -1274,11 +1213,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132596) { { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(2, getPages()); } @@ -1322,15 +1259,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133967) dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); for (sal_Int32 i = 0; i < 10; ++i) { dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); } // Without the fix in place, this test would have failed with: @@ -1383,27 +1317,22 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130094) pWrtShell->Down(/*bSelect=*/true); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString()); CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString()); CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(3)->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString()); CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString()); CPPUNIT_ASSERT_EQUAL(OUString("Third"), getParagraph(3)->getString()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString()); CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString()); @@ -1660,17 +1589,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf141175) dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); //Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -1720,7 +1646,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126504) xTransfer->Copy(); dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {}); - Scheduler::ProcessEventsToIdle(); TransferableDataHelper aHelper(xTransfer); SwTransferable::Paste(*pWrtShell, aHelper); @@ -1730,20 +1655,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126504) CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); //Without the fix in place, it would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -1799,7 +1721,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134253) //Without the fix in place, it would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(6, getPages()); @@ -1863,9 +1784,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf140975) // Set the Anchor of the shape to As_Char dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SetAnchorToChar", {}); - Scheduler::ProcessEventsToIdle(); // Get the layout of the textbox auto pExportDump = parseLayoutDump(); @@ -1967,10 +1886,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf140828) uno::Reference<beans::XPropertySet> ShpProps(xShp, uno::UNO_QUERY_THROW); dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SetAnchorAtChar", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL( text::TextContentAnchorType::TextContentAnchorType_AT_CHARACTER, @@ -1995,11 +1912,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725) CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:GoToEndOfPara", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SwBackspace", {}); dispatchCommand(mxComponent, ".uno:SwBackspace", {}); - Scheduler::ProcessEventsToIdle(); // tdf#137587 fly is no longer deleted by backspace CPPUNIT_ASSERT_EQUAL(1, getShapes()); @@ -2007,14 +1922,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725) dispatchCommand(mxComponent, ".uno:Undo", {}); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:Redo", {}); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); // tdf#137587 fly is no longer deleted by backspace CPPUNIT_ASSERT_EQUAL(1, getShapes()); @@ -2022,7 +1935,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725) //Without the fix in place, it would crash here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(OUString("A"), getParagraph(1)->getString()); @@ -2202,13 +2114,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134021) dispatchCommand(mxComponent, ".uno:JumpToNextTable", {}); dispatchCommand(mxComponent, ".uno:DeleteTable", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, it would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(12, getPages()); @@ -2227,13 +2137,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf136778) dispatchCommand(mxComponent, ".uno:JumpToNextTable", {}); dispatchCommand(mxComponent, ".uno:DeleteTable", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, it would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -2250,7 +2158,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf123285) ". Here is a short sentence demonstrating this very peculiar bug.")); dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {}); - Scheduler::ProcessEventsToIdle(); pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN); Scheduler::ProcessEventsToIdle(); @@ -2342,11 +2249,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130685) dispatchCommand(mxComponent, ".uno:Undo", {}); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(2, getPages()); } @@ -2358,11 +2263,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132944) dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, the document would have had 2 pages CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -2376,12 +2279,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf104649) dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Delete", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString()); } diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index 8240bc39cf2c..099b60dfab05 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -137,10 +137,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf146449) CPPUNIT_ASSERT(pShell->SelectObj(Point(), 0, pObject)); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); uno::Reference<beans::XPropertySet> xShapeProps(xTextBox, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xFrameProps(xShapeProps->getPropertyValue("TextBoxContent"), @@ -1286,7 +1284,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam) uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence( { { "NextTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[0]->GetId())) } })); dispatchCommand(mxComponent, ".uno:NextTrackedChange", aPropertyValues); - Scheduler::ProcessEventsToIdle(); SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false); // This failed: the parameter wasn't handled so the next change (zzz) was // selected, not the first one (aaa). @@ -1297,7 +1294,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam) aPropertyValues = comphelper::InitPropertySequence( { { "NextTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[1]->GetId())) } }); dispatchCommand(mxComponent, ".uno:NextTrackedChange", aPropertyValues); - Scheduler::ProcessEventsToIdle(); pShellCursor = pWrtShell->getShellCursor(false); CPPUNIT_ASSERT_EQUAL(OUString("zzz"), pShellCursor->GetText()); @@ -1306,7 +1302,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam) aPropertyValues = comphelper::InitPropertySequence( { { "RejectTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[1]->GetId())) } }); dispatchCommand(mxComponent, ".uno:RejectTrackedChange", aPropertyValues); - Scheduler::ProcessEventsToIdle(); pShellCursor = pWrtShell->getShellCursor(false); // This was 'middlezzz', the uno command rejected the redline under the @@ -1460,7 +1455,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testLandscape) uno::Sequence<beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence({ { "AttributePage.Landscape", uno::Any(true) } })); dispatchCommand(mxComponent, ".uno:AttributePage", aPropertyValues); - Scheduler::ProcessEventsToIdle(); // Assert that the document model was modified. SwDocShell* pDocShell = pDoc->GetDocShell(); @@ -1769,7 +1763,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableRemoveHasTextChangesOnly2) pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false); Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:AcceptTrackedChange", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); // Accepting tracked insertion results still 4 rows, but less redlines @@ -1786,7 +1779,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableRemoveHasTextChangesOnly2) // To check Undo of HasTextChangesOnly reject the same row results 3 rows dispatchCommand(mxComponent, ".uno:Escape", {}); dispatchCommand(mxComponent, ".uno:RejectTrackedChange", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); // This was 4 (lost HasTextChangesOnly) @@ -1820,7 +1812,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf147182_AcceptAllChangesInTableSelec dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:AcceptTrackedChange", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); // Accepting tracked changes in the selected table results 3 rows @@ -1840,7 +1831,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf147182_AcceptAllChangesInTableSelec dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:RejectTrackedChange", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); // This was 4 (only text changes of the first selected cell were rejected) diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx b/sw/qa/extras/uiwriter/uiwriter5.cxx index 890cf3b52131..90b994ffc2f2 100644 --- a/sw/qa/extras/uiwriter/uiwriter5.cxx +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx @@ -1972,7 +1972,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf151657) // accept all tracked changes dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -1994,10 +1993,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testSelectRowWithNestedTable) // select table row dispatchCommand(mxComponent, ".uno:EntireRow", {}); - Scheduler::ProcessEventsToIdle(); // convert selected text content to uppercase dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -2029,7 +2026,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf47979_row) // convert selected text content to uppercase dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {}); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); assertXPathContent(pXmlDoc, "//page[1]//body/tab/row[1]/cell[1]/txt[1]", "a1"); @@ -2066,7 +2062,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf47979_column) // convert selected text content to uppercase dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {}); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -3102,7 +3097,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747) { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); pWrtSh->Insert("Col1"); @@ -3162,7 +3156,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747) getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "ParaStyleName")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL( OUString("Table Contents"), @@ -3173,7 +3166,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747) getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "ParaStyleName")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL( OUString("Table Contents"), @@ -3194,7 +3186,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); pWrtSh->Insert("Col1"); @@ -3224,7 +3215,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) pWrtSh->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1, /*bBasicCall=*/false); dispatchCommand(mxComponent, ".uno:DefaultNumbering", {}); - Scheduler::ProcessEventsToIdle(); // B1 should now have a numbering style, but A1 should not be affected. OUString sNumStyleB1 @@ -3237,7 +3227,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) // Toggle it back off dispatchCommand(mxComponent, ".uno:DefaultNumbering", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_MESSAGE( "Cell B1 must be able to toggle numbering on and off.", @@ -3250,7 +3239,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) // Toggle on bullet numbering dispatchCommand(mxComponent, ".uno:DefaultBullet", {}); - Scheduler::ProcessEventsToIdle(); // sanity check - both cells have bullets turned on. OUString sNumStyleA1 @@ -3266,7 +3254,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) // Toggle off bullet numbering dispatchCommand(mxComponent, ".uno:DefaultBullet", {}); - Scheduler::ProcessEventsToIdle(); // B1 should now have removed all numbering, while A1 should still have the bullet. CPPUNIT_ASSERT( @@ -3279,7 +3266,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151) // Toggle it back on dispatchCommand(mxComponent, ".uno:DefaultBullet", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT( !getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "NumberingStyleName") diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index b2b1f9687d86..3450085e7757 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -120,7 +120,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf116640) comphelper::InitPropertySequence({ { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertSection", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xSections(xTextSectionsSupplier->getTextSections(), @@ -134,17 +133,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf116640) CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xTextColumns->getColumnCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount()); } @@ -919,7 +915,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf147181_TrackedMovingOfMultipleTable // accept changes results 1 table (removing moved table) dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {}); - Scheduler::ProcessEventsToIdle(); uno::Reference<container::XIndexAccess> xTables2(xTablesSupplier->getTextTables(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables2->getCount()); @@ -2248,15 +2243,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testNestedGroupTextBoxCopyCrash) createSwDoc("tdf149550.docx"); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); // This crashed here before the fix. SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_ESCAPE); Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_MESSAGE("Where is the doc, it crashed, isn't it?!", mxComponent); @@ -2289,13 +2281,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testCrashOnExit) // Remove the textbox dispatchCommand(mxComponent, ".uno:RemoveTextBox", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(false, xProperties->getPropertyValue("TextBox").get<bool>()); // Readd the textbox (to run the textboxhelper::create() method) dispatchCommand(mxComponent, ".uno:AddTextBox", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(true, xProperties->getPropertyValue("TextBox").get<bool>()); @@ -2335,7 +2325,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828_Comment2) uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } })); dispatchCommand(mxComponent, ".uno:BasicShapes", aArgs); - Scheduler::ProcessEventsToIdle(); auto xBasicShape = getShape(1); auto pObject = SdrObject::getSdrObjectFromXShape(xBasicShape); @@ -2347,12 +2336,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828_Comment2) // cut and paste it dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); @@ -2385,11 +2372,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828) // cut and paste the table dispatchCommand(mxComponent, ".uno:SelectTable", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); // move cursor into the pasted table CPPUNIT_ASSERT(pWrtShell->MoveTable(GotoPrevTable, fnTableStart)); diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx index f04c802ea3b0..6684940700ca 100644 --- a/sw/qa/extras/uiwriter/uiwriter7.cxx +++ b/sw/qa/extras/uiwriter/uiwriter7.cxx @@ -2469,7 +2469,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf138873) CPPUNIT_ASSERT_EQUAL(OUString("A DDD C"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("A B C"), getParagraph(1)->getString()); @@ -2477,10 +2476,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf138873) pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, /*bBasicCall=*/false); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have failed with // - Expected: A B C diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 415f9b76c691..c9d8384fec5b 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -111,14 +111,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132420) CPPUNIT_ASSERT_EQUAL(12, getShapes()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); //Without the fix in place, 1 frame and 1 image would be gone and getShapes would return 10 CPPUNIT_ASSERT_EQUAL(12, getShapes()); @@ -140,7 +137,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132744) CPPUNIT_ASSERT_EQUAL(1, getShapes()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); rtl::Reference<SwTransferable> xTransfer = new SwTransferable(*pWrtShell); xTransfer->Cut(); @@ -183,14 +179,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146622) dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:DeleteRows", {}); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable1->getRows()->getCount()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:DeleteRows", {}); // This was 2 (deleting the already deleted table with change tracking) @@ -391,7 +385,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391) // remove the selection and positionate the cursor at beginning of A2 pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); // 3-row, overwriting cells of the second row and inserting a new row @@ -427,7 +420,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391) // insert the table, as a nested one in cell "A2" dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2); @@ -437,7 +429,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391) // Undo dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); // 2 rows again, no copied text content @@ -451,7 +442,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391) pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false); pWrtShell->Insert("and some text again in the first paragraph to be sure..."); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -485,7 +475,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791) pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false); pWrtShell->Up(/*bSelect=*/false); dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {}); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); // Paste as Rows Above results 4-row table with default table alignment @@ -523,7 +512,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791) pWrtShell->Up(/*bSelect=*/false); pWrtShell->Up(/*bSelect=*/false); dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -551,7 +539,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791) for (int i = 0; i < 7 + 4; ++i) pWrtShell->Up(/*bSelect=*/false); dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -576,7 +563,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791) for (int i = 0; i < 15 + 4 * 2; ++i) pWrtShell->Up(/*bSelect=*/false); dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pXmlDoc = parseLayoutDump(); @@ -595,7 +581,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135014) // Toggle Numbering List dispatchCommand(mxComponent, ".uno:DefaultBullet", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Sequence<beans::PropertyValue> aArgs2(comphelper::InitPropertySequence( { { "Param", uno::Any(OUString("NewNumberingStyle")) }, @@ -603,7 +588,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135014) // New Style from selection dispatchCommand(mxComponent, ".uno:StyleNewByExample", aArgs2); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have failed here reload("Office Open XML Text", "tdf135014.docx"); @@ -621,7 +605,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf130629) comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } })); dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); @@ -637,7 +620,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf130629) // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); } @@ -702,32 +684,25 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731) for (sal_Int32 i = 0; i < 8; ++i) { dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); } dispatchCommand(mxComponent, ".uno:GoToStartOfDoc", {}); - Scheduler::ProcessEventsToIdle(); // Format->Text operations on small selections (which would generate <~500 redlines) // changetracking still working dispatchCommand(mxComponent, ".uno:TrackChanges", {}); - Scheduler::ProcessEventsToIdle(); SwCursorShell* pShell(pDoc->GetEditShell()); pShell->SelectTextModel(1, 500); dispatchCommand(mxComponent, ".uno:ChangeCaseToTitleCase", {}); - Scheduler::ProcessEventsToIdle(); SwEditShell* const pEditShell(pDoc->GetEditShell()); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(120), @@ -735,15 +710,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731) //Removing all the redlines. dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:ChangeCaseToTitleCase", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, on big selections writer would freeze. Now it ignores change tracking. CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount()); @@ -752,7 +724,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731) CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Lorem Ipsum Dolor Sit Amet")); dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("LOREM IPSUM DOLOR SIT AMET")); } @@ -837,7 +808,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146248) // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xPageStyle, "HeaderIsOn")); } @@ -847,15 +817,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152964) createSwDoc(); dispatchCommand(mxComponent, ".uno:TrackChanges", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {}); - Scheduler::ProcessEventsToIdle(); uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence( { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -871,27 +838,22 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152964) dispatchCommand(mxComponent, ".uno:GoDown", {}); dispatchCommand(mxComponent, ".uno:DeleteRows", {}); dispatchCommand(mxComponent, ".uno:DeleteRows", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(2), pEditShell->GetRedlineCount()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(1), pEditShell->GetRedlineCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(1), pEditShell->GetRedlineCount()); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(2), pEditShell->GetRedlineCount()); } @@ -907,7 +869,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf107427) { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pLayout = parseLayoutDump(); assertXPath(pLayout, "/root/page[1]/header/tab/row", 2); @@ -922,7 +883,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf107427) assertXPath(pLayout, "/root/page[1]/header", 0); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); discardDumpedLayout(); pLayout = parseLayoutDump(); @@ -1044,7 +1004,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131771) { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -1087,7 +1046,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf80663) { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -1098,14 +1056,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf80663) CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount()); dispatchCommand(mxComponent, ".uno:DeleteRows", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTextTable->getRows()->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getRows()->getCount()); @@ -1171,7 +1127,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121031) { { "Rows", uno::Any(sal_Int32(3)) }, { "Columns", uno::Any(sal_Int32(3)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -1179,11 +1134,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121031) CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); dispatchCommand(mxComponent, ".uno:DeleteTable", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Without the fix in place, the table would be hidden @@ -1224,10 +1177,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121546) CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getParagraphs()); @@ -1235,25 +1186,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121546) createSwDoc(); dispatchCommand(mxComponent, ".uno:Paste", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:Cut", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getParagraphs()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); @@ -1317,12 +1263,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf134626) CPPUNIT_ASSERT_EQUAL(OUString("AppleApple"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("Apple"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString()); } @@ -1338,7 +1282,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf139566) { { "Rows", uno::Any(sal_Int32(1)) }, { "Columns", uno::Any(sal_Int32(1)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); // Move the cursor outside the table pWrtSh->Down(/*bSelect=*/false); @@ -1348,19 +1291,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf139566) CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(2)->getString()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); uno::Reference<frame::XFrames> xFrames = mxDesktop->getFrames(); sal_Int32 nFrames = xFrames->getCount(); // Create a second window so the first window looses focus dispatchCommand(mxComponent, ".uno:NewWindow", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(nFrames + 1, xFrames->getCount()); dispatchCommand(mxComponent, ".uno:CloseWin", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(nFrames, xFrames->getCount()); @@ -1380,7 +1320,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf96067) { { "Rows", uno::Any(sal_Int32(3)) }, { "Columns", uno::Any(sal_Int32(3)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -1392,14 +1331,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf96067) dispatchCommand(mxComponent, ".uno:SelectTable", {}); dispatchCommand(mxComponent, ".uno:InsertRowsBefore", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xTextTable->getRows()->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTextTable->getColumns()->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTextTable->getRows()->getCount()); @@ -1431,7 +1368,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf87199) dispatchCommand(mxComponent, ".uno:EntireColumn", {}); dispatchCommand(mxComponent, ".uno:MergeCells", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTextTable->getRows()->getCount()); @@ -1440,7 +1376,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf87199) CPPUNIT_ASSERT(xCellA1->getString().endsWith("test2")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getRows()->getCount()); @@ -1492,7 +1427,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146573) // remove redlines, add a footnote, and change the value // of the cell with the footnote dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {}); - Scheduler::ProcessEventsToIdle(); pWrtShell->Right(SwCursorSkipMode::Cells, /*bSelect=*/false, /*nCount=*/1, /*bBasicCall=*/false); dispatchCommand(mxComponent, ".uno:InsertFootnote", {}); @@ -1671,7 +1605,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf150576) // restore deleted rows dispatchCommand(mxComponent, ".uno:Undo", {}); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); SwNode& rNode5 = pWrtShell->GetCursor()->GetPoint()->GetNode(); CPPUNIT_ASSERT_EQUAL(OUString("Row 2"), rNode5.GetTextNode()->GetText()); @@ -1698,14 +1631,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132603) = comphelper::InitPropertySequence({ { "Text", uno::Any(OUString("Comment")) } }); dispatchCommand(mxComponent, ".uno:InsertAnnotation", aPropertyValues); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SelectAll", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, it would crash here dispatchCommand(mxComponent, ".uno:Copy", {}); - Scheduler::ProcessEventsToIdle(); tools::JsonWriter aJsonWriter; pTextDoc->getPostIts(aJsonWriter); @@ -1731,7 +1661,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601) { { "Rows", uno::Any(sal_Int32(5)) }, { "Columns", uno::Any(sal_Int32(3)) } })); dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); - Scheduler::ProcessEventsToIdle(); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -1754,7 +1683,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601) dispatchCommand(mxComponent, ".uno:EntireColumn", {}); dispatchCommand(mxComponent, ".uno:MergeCells", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTextTable->getRows()->getCount()); @@ -1763,7 +1691,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601) CPPUNIT_ASSERT(xCellB1->getString().endsWith("test2")); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTextTable->getRows()->getCount()); @@ -1783,18 +1710,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf138130) //select shape and change the anchor dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {}); - Scheduler::ProcessEventsToIdle(); //position has changed CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X); CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(aPos.X, xShape->getPosition().X); CPPUNIT_ASSERT_EQUAL(aPos.Y, xShape->getPosition().Y); @@ -1811,17 +1735,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136385) //select shape and change the anchor dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {}); - Scheduler::ProcessEventsToIdle(); //position has changed CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X); CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); //Without the fix in place, this test would have failed with //- Expected: 2447 @@ -1840,7 +1761,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf145207) //select one shape and use the TAB key to iterate over the different shapes dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); for (sal_Int32 i = 0; i < 10; ++i) { @@ -1866,7 +1786,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128782) //select shape 2 and move it down dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN); Scheduler::ProcessEventsToIdle(); @@ -1878,7 +1797,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128782) CPPUNIT_ASSERT(aPos[1].Y < xShape2->getPosition().Y); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X); CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y); @@ -1905,7 +1823,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135623) //select shape 1 and move it down dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN); Scheduler::ProcessEventsToIdle(); @@ -1917,7 +1834,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135623) CPPUNIT_ASSERT_EQUAL(aPos[1].Y, xShape2->getPosition().Y); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X); CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y); @@ -1969,7 +1885,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490) //select shape 2 and move it to the right dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {}); - Scheduler::ProcessEventsToIdle(); for (sal_Int32 i = 0; i < 5; ++i) { @@ -1986,7 +1901,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490) for (sal_Int32 i = 0; i < 4; ++i) { dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); // Without the fix in place, undo action would have changed shape1's position // and this test would have failed with @@ -1999,7 +1913,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490) } dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X); CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y); @@ -2008,17 +1921,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490) CPPUNIT_ASSERT_EQUAL(aPos[1].Y, xShape2->getPosition().Y); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(0, getShapes()); dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getShapes()); } @@ -2243,7 +2153,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf143244) for (sal_Int32 i = 0; i < 5; ++i) { dispatchCommand(mxComponent, ".uno:Undo", {}); - Scheduler::ProcessEventsToIdle(); } xTextTable.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY); @@ -2253,7 +2162,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf143244) for (sal_Int32 i = 0; i < 5; ++i) { dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); } xTextTable.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY); @@ -2394,7 +2302,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf138897) dispatchCommand(mxComponent, ".uno:Redo", {}); dispatchCommand(mxComponent, ".uno:Undo", {}); dispatchCommand(mxComponent, ".uno:Redo", {}); - Scheduler::ProcessEventsToIdle(); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136740) @@ -2430,7 +2337,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136740) { { "SelectedFormat", css::uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } }); dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues); - Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(1, getParagraphs()); CPPUNIT_ASSERT_EQUAL(OUString("FooFoo"), xParagraph->getString()); @@ -2450,7 +2356,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128106) const auto aPropertyValues = comphelper::InitPropertySequence({ { "FileName", css::uno::Any(maTempFile.GetURL()) } }); dispatchCommand(mxComponent, ".uno:NewGlobalDoc", aPropertyValues); - Scheduler::ProcessEventsToIdle(); mxComponent = loadFromDesktop(maTempFile.GetURL()); @@ -2585,7 +2490,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf151462) createSwDoc("tdf151462.odt"); // xmlDocUniquePtr pLayout = parseLayoutDump(); dispatchCommand(mxComponent, ".uno:UpdateAllIndexes", {}); - Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pLayout = parseLayoutDump(); // tdf#151462 - without the fix in place, there would be just the first index entry |