[Libreoffice-commits] core.git: sc/Module_sc.mk sc/qa sc/UITest_goalSeek.mk
Zdeněk Crhonek
zcrhonek at gmail.com
Wed Jun 20 19:37:52 UTC 2018
sc/Module_sc.mk | 1
sc/UITest_goalSeek.mk | 20 ++++++++++++
sc/qa/uitest/calc_tests/data/goalSeek.ods |binary
sc/qa/uitest/calc_tests/data/tdf37341.ods |binary
sc/qa/uitest/calc_tests/data/tdf43693.ods |binary
sc/qa/uitest/goalSeek/goalSeek.py | 49 ++++++++++++++++++++++++++++++
sc/qa/uitest/goalSeek/tdf37341.py | 46 ++++++++++++++++++++++++++++
sc/qa/uitest/goalSeek/tdf43693.py | 46 ++++++++++++++++++++++++++++
sc/qa/uitest/solver/solver.py | 3 -
9 files changed, 163 insertions(+), 2 deletions(-)
New commits:
commit 1b4c09401053ff6df8de9e839299ac26efa28b37
Author: Zdeněk Crhonek <zcrhonek at gmail.com>
Date: Wed Jun 20 20:03:26 2018 +0200
uitest Calc/Goal seek; tdf#37341 ; tdf#43693
Change-Id: Ib6416eec6245f22f49687437a466b1e5c6d60efb
Reviewed-on: https://gerrit.libreoffice.org/56181
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index e8e1bb5b2bfb..2474f08553fa 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -190,6 +190,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
UITest_calc_tests4 \
UITest_statistics \
UITest_solver \
+ UITest_goalSeek \
))
endif
diff --git a/sc/UITest_goalSeek.mk b/sc/UITest_goalSeek.mk
new file mode 100644
index 000000000000..0990482e7fd2
--- /dev/null
+++ b/sc/UITest_goalSeek.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,goalSeek))
+
+$(eval $(call gb_UITest_add_modules,goalSeek,$(SRCDIR)/sc/qa/uitest,\
+ goalSeek/ \
+))
+
+$(eval $(call gb_UITest_set_defs,goalSeek, \
+ TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/calc_tests/data/goalSeek.ods b/sc/qa/uitest/calc_tests/data/goalSeek.ods
new file mode 100644
index 000000000000..fd78ec0197e4
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/goalSeek.ods differ
diff --git a/sc/qa/uitest/calc_tests/data/tdf37341.ods b/sc/qa/uitest/calc_tests/data/tdf37341.ods
new file mode 100644
index 000000000000..d0f5024fb1ac
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf37341.ods differ
diff --git a/sc/qa/uitest/calc_tests/data/tdf43693.ods b/sc/qa/uitest/calc_tests/data/tdf43693.ods
new file mode 100644
index 000000000000..501a07765e71
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf43693.ods differ
diff --git a/sc/qa/uitest/goalSeek/goalSeek.py b/sc/qa/uitest/goalSeek/goalSeek.py
new file mode 100644
index 000000000000..59d8b894009d
--- /dev/null
+++ b/sc/qa/uitest/goalSeek/goalSeek.py
@@ -0,0 +1,49 @@
+# -*- 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
+from uitest.debug import sleep
+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 goalSeek(UITestCase):
+ def test_goalSeek(self):
+ calc_doc = self.ui_test.load_file(get_url_for_data_file("goalSeek.ods"))
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+ document = self.ui_test.get_component()
+ gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B4"}))
+ self.ui_test.execute_modeless_dialog_through_command(".uno:GoalSeekDialog")
+ xDialog = self.xUITest.getTopFocusWindow()
+ xformulaedit = xDialog.getChild("formulaedit")
+ xtarget = xDialog.getChild("target")
+ xvaredit = xDialog.getChild("varedit")
+ xtarget.executeAction("TYPE", mkPropertyValues({"TEXT":"15000"}))
+ xvaredit.executeAction("TYPE", mkPropertyValues({"TEXT":"B1"}))
+ xOKBtn = xDialog.getChild("ok")
+
+ def handle_OK_dlg(dialog):
+ print(dialog.getChildren())
+ xYesButn = dialog.getChild("yes")
+ self.ui_test.close_dialog_through_button(xYesButn)
+
+ self.ui_test.execute_blocking_action(xOKBtn.executeAction, args=('CLICK', ()),
+ dialog_handler=handle_OK_dlg)
+ #verify
+ self.assertEqual(get_cell_by_position(document, 0, 1, 0).getValue(), 200000)
+ self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 15000)
+ self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/goalSeek/tdf37341.py b/sc/qa/uitest/goalSeek/tdf37341.py
new file mode 100644
index 000000000000..dcae4bb38aed
--- /dev/null
+++ b/sc/qa/uitest/goalSeek/tdf37341.py
@@ -0,0 +1,46 @@
+# -*- 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
+
+def get_url_for_data_file(file_name):
+ return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 37341 - Goal Seek hangs indefinitely for too many calculation steps (Formula Cell $F$110)
+
+class tdf37341(UITestCase):
+ def test_tdf37341_goalSeek(self):
+ calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf37341.ods"))
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+ document = self.ui_test.get_component()
+ gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "F111"}))
+ self.ui_test.execute_modeless_dialog_through_command(".uno:GoalSeekDialog")
+ xDialog = self.xUITest.getTopFocusWindow()
+ xformulaedit = xDialog.getChild("formulaedit")
+ xtarget = xDialog.getChild("target")
+ xvaredit = xDialog.getChild("varedit")
+ xtarget.executeAction("TYPE", mkPropertyValues({"TEXT":"0"}))
+ xvaredit.executeAction("TYPE", mkPropertyValues({"TEXT":"E7"}))
+ xOKBtn = xDialog.getChild("ok")
+ def handle_OK_dlg(dialog):
+ xYesButn = dialog.getChild("yes")
+ self.ui_test.close_dialog_through_button(xYesButn)
+
+ self.ui_test.execute_blocking_action(xOKBtn.executeAction, args=('CLICK', ()),
+ dialog_handler=handle_OK_dlg)
+ #verify
+ self.assertEqual(get_cell_by_position(document, 0, 4, 6).getValue(), 12879.147)
+ self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/goalSeek/tdf43693.py b/sc/qa/uitest/goalSeek/tdf43693.py
new file mode 100644
index 000000000000..991c91bbe46a
--- /dev/null
+++ b/sc/qa/uitest/goalSeek/tdf43693.py
@@ -0,0 +1,46 @@
+# -*- 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
+
+def get_url_for_data_file(file_name):
+ return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 43693 - Goal Seek: reproducable crash using "target value search"
+
+class tdf43693(UITestCase):
+ def test_tdf43693_goalSeek(self):
+ calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf43693.ods"))
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+ document = self.ui_test.get_component()
+ gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "K248"}))
+ self.ui_test.execute_modeless_dialog_through_command(".uno:GoalSeekDialog")
+ xDialog = self.xUITest.getTopFocusWindow()
+ xformulaedit = xDialog.getChild("formulaedit")
+ xtarget = xDialog.getChild("target")
+ xvaredit = xDialog.getChild("varedit")
+ xtarget.executeAction("TYPE", mkPropertyValues({"TEXT":"0"}))
+ xvaredit.executeAction("TYPE", mkPropertyValues({"TEXT":"H5"}))
+ xOKBtn = xDialog.getChild("ok")
+ def handle_OK_dlg(dialog):
+ xYesButn = dialog.getChild("yes")
+ self.ui_test.close_dialog_through_button(xYesButn)
+
+ self.ui_test.execute_blocking_action(xOKBtn.executeAction, args=('CLICK', ()),
+ dialog_handler=handle_OK_dlg)
+ #verify
+ self.assertEqual(get_cell_by_position(document, 0, 7, 4).getValue(), 0.04)
+ self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/solver/solver.py b/sc/qa/uitest/solver/solver.py
index e6ca81029985..4503a5da6877 100644
--- a/sc/qa/uitest/solver/solver.py
+++ b/sc/qa/uitest/solver/solver.py
@@ -49,7 +49,6 @@ class solver(UITestCase):
xop2list.executeAction("SELECT", actionProps)
xval2edit.executeAction("TYPE", mkPropertyValues({"TEXT":"0"}))
- sleep(4)
xOKBtn = xDialog.getChild("solve")
def handle_OK_dlg(dialog):
#('SolverSuccessDialog', 'cancel', 'dialog-action_area1', 'dialog-vbox1', 'grid1', 'label1', 'label2', 'ok', 'result')
@@ -62,4 +61,4 @@ class solver(UITestCase):
self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 400)
self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
More information about the Libreoffice-commits
mailing list