[Libreoffice-commits] core.git: sw/qa uitest/writer_tests uitest/writer_tests3

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   21 ++++++++++++++++++++
 uitest/writer_tests3/tdf104649.py   |   37 ------------------------------------
 2 files changed, 21 insertions(+), 37 deletions(-)

New commits:
commit 879f847d9d6ef5a165f660c55f2070f4b207512b
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Oct 26 15:40:15 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Oct 27 00:32:14 2020 +0100

    tdf#104649: move UItest to CppunitTest
    
    Change-Id: I950432390e65dfabb4562a61b6091b085b9f5d0c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104813
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/uitest/writer_tests/data/tdf104649.docx b/sw/qa/extras/uiwriter/data3/tdf104649.docx
similarity index 100%
rename from uitest/writer_tests/data/tdf104649.docx
rename to sw/qa/extras/uiwriter/data3/tdf104649.docx
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 5fed2bfc4496..a19ceff4c6b2 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1043,6 +1043,27 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132944)
     CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf104649)
+{
+    load(DATA_DIRECTORY, "tdf104649.docx");
+
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+
+    CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString());
+
+    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());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134931)
 {
     load(DATA_DIRECTORY, "tdf134931.odt");
diff --git a/uitest/writer_tests3/tdf104649.py b/uitest/writer_tests3/tdf104649.py
deleted file mode 100644
index f6541feee5a4..000000000000
--- a/uitest/writer_tests3/tdf104649.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-from uitest.framework import UITestCase
-
-import org.libreoffice.unotest
-import pathlib
-
-def get_url_for_data_file(file_name):
-    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-
-class tdf104649(UITestCase):
-
-    def test_delete_and_undo(self):
-
-        writer_doc = self.ui_test.load_file(get_url_for_data_file("tdf104649.docx"))
-
-        document = self.ui_test.get_component()
-
-        self.assertEqual(document.Text.String[0:4], "Test")
-
-        selection = self.xUITest.executeCommand(".uno:SelectAll")
-
-        self.xUITest.executeCommand(".uno:Delete")
-
-        self.assertEqual(document.Text.String, "")
-
-        self.xUITest.executeCommand(".uno:Undo")
-
-        self.assertEqual(document.Text.String[0:4], "Test")
-
-        self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab: