sc/qa/uitest/calc_tests8/tdf124815.py | 40 ----------------------------------
sc/qa/unit/uicalc/uicalc.cxx | 16 +++++++++++++
2 files changed, 16 insertions(+), 40 deletions(-)
New commits:
commit 2af67c35d283abefe6030a5b90b831b0b797dd62
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Mar 10 16:26:06 2020 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Tue Mar 10 18:33:59 2020 +0100
tdf#124815: move UItest to CppunitTest
Change-Id: If6482bf6666f00c3c613315cd18d188239ea61f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90265
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sc/qa/uitest/calc_tests8/tdf124815.py
b/sc/qa/uitest/calc_tests8/tdf124815.py
deleted file mode 100644
index a4e581006b42..000000000000
--- a/sc/qa/uitest/calc_tests8/tdf124815.py
+++ /dev/null
@@ -1,40 +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 uitest.uihelper.common import get_state_as_dict
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_sheet_from_doc
-from libreoffice.calc.conditional_format import
get_conditional_format_from_sheet
-from uitest.debug import sleep
-from libreoffice.calc.document import get_cell_by_position
-from libreoffice.uno.propertyvalue import mkPropertyValues
-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 124815 - CRASH: inserting a column
-
-class tdf124815(UITestCase):
- def test_tdf124815_crash_inserting_column(self):
- #numberingformatpage.ui
- calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf124815.ods"))
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
-
- #Go to Sheet - Insert Column - Insert Column before
.uno:InsertColumnsBefore
- self.xUITest.executeCommand(".uno:InsertColumnsBefore")
- #verify
- self.assertEqual(get_cell_by_position(document, 0, 3, 0).getString(),
"Rakennukset")
- self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(),
"Rakennukset")
-
- self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests/data/tdf124815.ods
b/sc/qa/unit/uicalc/data/tdf124815.ods
similarity index 100%
rename from sc/qa/uitest/calc_tests/data/tdf124815.ods
rename to sc/qa/unit/uicalc/data/tdf124815.ods
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 00a8351fb8c8..ece9c4dbbff7 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -133,6 +133,22 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124816)
CPPUNIT_ASSERT_EQUAL(OUString("0"), pDoc->GetString(ScAddress(3, 9, 0)));
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124815)
+{
+ ScModelObj* pModelObj = createDoc("tdf124815.ods");
+ ScDocument* pDoc = pModelObj->GetDocument();
+ CPPUNIT_ASSERT(pDoc);
+
+ checkCurrentCell(0, 0);
+ CPPUNIT_ASSERT_EQUAL(OUString("Rakennukset"), pDoc->GetString(ScAddress(2,
0, 0)));
+
+ //Without the fix, it would crash
+ dispatchCommand(mxComponent, ".uno:InsertColumnsBefore", {});
+ CPPUNIT_ASSERT_EQUAL(OUString("Rakennukset"), pDoc->GetString(ScAddress(3,
0, 0)));
+ dispatchCommand(mxComponent, ".uno:Undo", {});
+ CPPUNIT_ASSERT_EQUAL(OUString("Rakennukset"), pDoc->GetString(ScAddress(2,
0, 0)));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
