[Libreoffice-commits] core.git: sc/Module_sc.mk sc/qa sc/UITest_sort.mk

[Libreoffice Gerrit user]

 sc/Module_sc.mk                           |    1 
 sc/UITest_sort.mk                         |   20 ++++++++
 sc/qa/uitest/calc_tests/data/tdf49531.ods |binary
 sc/qa/uitest/sort/tdf49531.py             |   67 ++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)

New commits:
commit b22d08827c0d42890cf1e45d084dc3e08bc48aa9
Author:     Zdeněk Crhonek <zcrhonek at gmail.com>
AuthorDate: Mon Dec 31 15:37:03 2018 +0100
Commit:     Zdenek Crhonek <zcrhonek at gmail.com>
CommitDate: Mon Dec 31 16:35:34 2018 +0100

    uitest for bug tdf#49531 tdf#49520
    
    Change-Id: Ief075273f6a1331ca5290e0e21386e4e6e16f54e
    Reviewed-on: https://gerrit.libreoffice.org/65773
    Tested-by: Jenkins
    Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 97a5e17bca3b..a80e9419b513 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -231,6 +231,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
 	UITest_inputLine \
 	UITest_hideShowSheet \
 	UITest_calc_tests7 \
+	UITest_sort \
 ))
 endif
 
diff --git a/sc/UITest_sort.mk b/sc/UITest_sort.mk
new file mode 100644
index 000000000000..c3514771572f
--- /dev/null
+++ b/sc/UITest_sort.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+
+$(eval $(call gb_UITest_UITest,sort))
+
+$(eval $(call gb_UITest_add_modules,sort,$(SRCDIR)/sc/qa/uitest,\
+	sort/ \
+))
+
+$(eval $(call gb_UITest_set_defs,sort, \
+    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/calc_tests/data/tdf49531.ods b/sc/qa/uitest/calc_tests/data/tdf49531.ods
new file mode 100644
index 000000000000..26fe76d3cb90
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf49531.ods differ
diff --git a/sc/qa/uitest/sort/tdf49531.py b/sc/qa/uitest/sort/tdf49531.py
new file mode 100644
index 000000000000..d88633c4ed60
--- /dev/null
+++ b/sc/qa/uitest/sort/tdf49531.py
@@ -0,0 +1,67 @@
+# -*- 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_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+import org.libreoffice.unotest
+import pathlib
+
+#Bug 49531 - EDITING: Sort rows for will sort columns
+#Bug 49520 - EDITING: CRASH when undo sort with chart
+def get_url_for_data_file(file_name):
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf49531(UITestCase):
+    def test_td49531_sort_undo_crash(self):
+        calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf49531.ods"))
+        xCalcDoc = self.xUITest.getTopFocusWindow()
+        gridwin = xCalcDoc.getChild("grid_window")
+        document = self.ui_test.get_component()
+        #select A3:C147
+        gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A3:C147"}))
+
+        #Menu 'Data -> Sort -> Top to bottom - all otheroptions unchecked
+        #Column B - Ascending' <ok>
+        self.ui_test.execute_dialog_through_command(".uno:DataSort")
+        xDialog = self.xUITest.getTopFocusWindow()
+        xTabs = xDialog.getChild("tabcontrol")
+        select_pos(xTabs, "1")
+        xNatural = xDialog.getChild("naturalsort")
+        xtopdown = xDialog.getChild("topdown")
+        xHeader = xDialog.getChild("header")
+        if (get_state_as_dict(xNatural)["Selected"]) == "true":
+            xNatural.executeAction("CLICK", tuple())
+        if (get_state_as_dict(xHeader)["Selected"]) == "true":
+            xHeader.executeAction("CLICK", tuple())
+        xtopdown.executeAction("CLICK", tuple())
+        select_pos(xTabs, "0")
+        xSortKey1 = xDialog.getChild("sortlb")
+        xAsc = xDialog.getChild("up")
+        props = {"TEXT": "Column B"}
+        actionProps = mkPropertyValues(props)
+        xSortKey1.executeAction("SELECT", actionProps)
+        xAsc.executeAction("CLICK", tuple())
+        xOk = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOk)
+        #Verify
+        self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "x")
+        self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), "0")
+        self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 111)
+        self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 48)
+        # UNDO Bug 49520 - EDITING: CRASH when undo sort with chart
+        self.xUITest.executeCommand(".uno:Undo")
+        # Verify
+        self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "x")
+        self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), "0")
+        self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 2)
+        self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 3)
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab: