sw/qa/extras/uiwriter/data/tdf132911.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 74 +++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
New commits:
commit b2faa46071ff4a00672b0699e524e7ae66915fc0
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jul 28 18:34:48 2020 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Wed Oct 28 08:19:07 2020 +0100
tdf#132911: sw_uiwriter: Add unittest
Change-Id: I0ad6697d8dce814f20ea5f98e9c8f4b9c68f278d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99641
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit a206054ac048702d48077eea6f3d464c3d241ab3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104824
Tested-by: Michael Stahl <michael.st...@cib.de>
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/qa/extras/uiwriter/data/tdf132911.odt
b/sw/qa/extras/uiwriter/data/tdf132911.odt
new file mode 100644
index 000000000000..3c311f3ed36b
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf132911.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index d287894f94db..0bd769d2b121 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5784,6 +5784,80 @@ void SwUiWriterTest::testRedlineViewAuthor()
pDocShell->SetView(pView);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf132911)
+{
+ load(DATA_DIRECTORY, "tdf132911.odt");
+
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+
+ auto getShapes = [&]() -> int
+ {
+ uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xDraws =
xDrawPageSupplier->getDrawPage();
+ return xDraws->getCount();
+ };
+
+ uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {});
+ lcl_dispatchCommand(mxComponent, ".uno:Cut", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+ // Without the fix in place, it would have crashed here
+ lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(8, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(8, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+ lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+ //FIXME: tdf#135247
+ //lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+ //Scheduler::ProcessEventsToIdle();
+ //CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ //CPPUNIT_ASSERT_EQUAL(4, getShapes());
+}
+
void SwUiWriterTest::testTdf91292()
{
createDoc("tdf91292_paraBackground.docx");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
