sw/qa/extras/uiwriter/uiwriter3.cxx | 15 ++++++++++++
sw/qa/uitest/writer_tests6/tdf126340.py | 39 --------------------------------
2 files changed, 15 insertions(+), 39 deletions(-)
New commits:
commit bf16e836dd7094cb5679042bbd49cb8b49c869d2
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Feb 28 19:44:38 2020 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sat Feb 29 01:59:17 2020 +0100
tdf#126340: move UItest to CppunitTest
Change-Id: I8737f57de1c5b38d551dd31525a8a40f4f2458c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89737
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/qa/uitest/writer_tests/data/tdf126340.odt
b/sw/qa/extras/uiwriter/data3/tdf126340.odt
similarity index 100%
rename from sw/qa/uitest/writer_tests/data/tdf126340.odt
rename to sw/qa/extras/uiwriter/data3/tdf126340.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 8e969a42f309..2e1e1e033461 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -63,4 +63,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128739)
// without the fix, it crashes
dispatchCommand(mxComponent, ".uno:Undo", {});
}
+
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340)
+{
+ load(DATA_DIRECTORY, "tdf126340.odt");
+
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+
+ dispatchCommand(mxComponent, ".uno:GoDown", {});
+ // without the fix, it crashes
+ dispatchCommand(mxComponent, ".uno:Delete", {});
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), getParagraph(1)->getString());
+ dispatchCommand(mxComponent, ".uno:Undo", {});
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), getParagraph(1)->getString());
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/uitest/writer_tests6/tdf126340.py
b/sw/qa/uitest/writer_tests6/tdf126340.py
deleted file mode 100644
index 72ab66de5ba0..000000000000
--- a/sw/qa/uitest/writer_tests6/tdf126340.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# 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
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, type_text
-import time
-from uitest.debug import sleep
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import select_pos
-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()
-
-#Bug 126340 - Crash when removing entry in bullet list (change tracking
involved)
-
-class tdf126340(UITestCase):
- def test_tdf126340_crash_paste(self):
- writer_doc =
self.ui_test.load_file(get_url_for_data_file("tdf126340.odt"))
- document = self.ui_test.get_component()
- xWriterDoc = self.xUITest.getTopFocusWindow()
- xWriterEdit = xWriterDoc.getChild("writer_edit")
-
- # Put the cursor to the empty bullet list entry
- self.xUITest.executeCommand(".uno:GoDown")
- # Hit delete
- xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"DELETE"}))
- #-> Crash
- self.assertEqual(document.Text.String[0:3], "foo")
- self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual(document.Text.String[0:3], "foo")
-
- self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
