sw/qa/extras/uiwriter/uiwriter3.cxx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
New commits: commit 6086aa1cb40bb6d61834fa0dd708aab1751142de Author: Xisco Fauli <[email protected]> AuthorDate: Fri Feb 28 21:01:12 2020 +0100 Commit: Xisco Faulí <[email protected]> CommitDate: Sat Feb 29 10:38:18 2020 +0100 uiwriter3: add some more asserts Change-Id: I21317cbdda87d9ed1aed55ebb463f0802dcab2e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89748 Tested-by: Jenkins Reviewed-by: Xisco Faulí <[email protected]> diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index 2e1e1e033461..6e9dc4f1d4e2 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -26,12 +26,25 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); CPPUNIT_ASSERT(pTextDoc); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xDraws = xDrawPageSupplier->getDrawPage(); + + CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws->getCount()); + CPPUNIT_ASSERT_EQUAL(2, getPages()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Cut", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount()); + CPPUNIT_ASSERT_EQUAL(1, getPages()); dispatchCommand(mxComponent, ".uno:Paste", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws->getCount()); + CPPUNIT_ASSERT_EQUAL(2, getPages()); dispatchCommand(mxComponent, ".uno:Undo", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount()); + CPPUNIT_ASSERT_EQUAL(1, getPages()); + // without the fix, it crashes dispatchCommand(mxComponent, ".uno:Undo", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws->getCount()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126626) @@ -41,13 +54,23 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126626) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); CPPUNIT_ASSERT(pTextDoc); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xDraws = xDrawPageSupplier->getDrawPage(); + + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Copy", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); dispatchCommand(mxComponent, ".uno:Paste", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); dispatchCommand(mxComponent, ".uno:Paste", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xDraws->getCount()); dispatchCommand(mxComponent, ".uno:Undo", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); + // without the fix, it crashes dispatchCommand(mxComponent, ".uno:Paste", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xDraws->getCount()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128739) @@ -57,11 +80,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128739) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); CPPUNIT_ASSERT(pTextDoc); + CPPUNIT_ASSERT_EQUAL(OUString("Fehler: Verweis nicht gefunden"), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:SelectAll", {}); dispatchCommand(mxComponent, ".uno:Cut", {}); + CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString()); dispatchCommand(mxComponent, ".uno:Paste", {}); + CPPUNIT_ASSERT_EQUAL(OUString("Fehler: Verweis nicht gefunden"), getParagraph(1)->getString()); // without the fix, it crashes dispatchCommand(mxComponent, ".uno:Undo", {}); + CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
