sc/qa/uitest/range_name/tdf137617.py | 73 ++++++++++++++---------------------
1 file changed, 31 insertions(+), 42 deletions(-)
New commits:
commit 400e4b1866cbf7ab4b703e31f6c0e9b4040a58e0
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Feb 6 18:00:08 2023 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Feb 7 09:34:59 2023 +0000
sc: use try/finally to reset the changes in OptionsTreeDialog
Otherwise it might affect other tests if it hits an assert
Change-Id: I2d2fe1c2dfb931c8c9d95e61d8fdb31236b96c57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146592
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/uitest/range_name/tdf137617.py
b/sc/qa/uitest/range_name/tdf137617.py
index 234cc99f84ac..c2ac24ebc6e7 100644
--- a/sc/qa/uitest/range_name/tdf137617.py
+++ b/sc/qa/uitest/range_name/tdf137617.py
@@ -15,6 +15,18 @@ from uitest.uihelper.calc import enter_text_to_cell
class tdf137617(UITestCase):
+ def change_formula_syntax(self, syntax):
+ with
self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as
xDialogOpt:
+
+ xPages = xDialogOpt.getChild("pages")
+ xCalcEntry = xPages.getChild('3')
+ xCalcEntry.executeAction("EXPAND", tuple())
+ xCalcFormulaEntry = xCalcEntry.getChild('4')
+ xCalcFormulaEntry.executeAction("SELECT", tuple())
+
+ xFormulaSyntax = xDialogOpt.getChild('formulasyntax')
+ select_by_text(xFormulaSyntax, syntax)
+
def test_tdf137617(self):
with self.ui_test.create_doc_in_start_center("calc"):
@@ -36,7 +48,6 @@ class tdf137617(UITestCase):
self.assertEqual('false',
get_state_as_dict(xDialog.getChild('bottom'))['Selected'])
self.assertEqual('false',
get_state_as_dict(xDialog.getChild('top'))['Selected'])
-
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
xPosWindow = calcDoc.getChild('pos_window')
@@ -46,56 +57,34 @@ class tdf137617(UITestCase):
self.assertEqual('Result2', get_state_as_dict(xPosWindow)['Text'])
- # Change formula syntax to "Excel R1C1"
- with
self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as
xDialogOpt:
-
- xPages = xDialogOpt.getChild("pages")
- xCalcEntry = xPages.getChild('3')
- xCalcEntry.executeAction("EXPAND", tuple())
- xCalcFormulaEntry = xCalcEntry.getChild('4')
- xCalcFormulaEntry.executeAction("SELECT", tuple())
-
- xFormulaSyntax = xDialogOpt.getChild('formulasyntax')
- select_by_text(xFormulaSyntax, "Excel R1C1")
-
-
- enter_text_to_cell(gridwin, "C1", "Result3")
- enter_text_to_cell(gridwin, "D1", "Result4")
-
- gridwin.executeAction("SELECT", mkPropertyValues({"RANGE":
"C1:D2"}))
-
- with
self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog:
-
-
- # Only top is selected
- self.assertEqual('false',
get_state_as_dict(xDialog.getChild('left'))['Selected'])
- self.assertEqual('false',
get_state_as_dict(xDialog.getChild('right'))['Selected'])
- self.assertEqual('false',
get_state_as_dict(xDialog.getChild('bottom'))['Selected'])
- self.assertEqual('true',
get_state_as_dict(xDialog.getChild('top'))['Selected'])
+ try:
+ self.change_formula_syntax("Excel R1C1")
+ enter_text_to_cell(gridwin, "C1", "Result3")
+ enter_text_to_cell(gridwin, "D1", "Result4")
- gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C2"}))
+ gridwin.executeAction("SELECT", mkPropertyValues({"RANGE":
"C1:D2"}))
- # Without the fix in place, this test would have failed with
- # AssertionError: 'Result3' != 'R2C3'
- self.assertEqual('Result3', get_state_as_dict(xPosWindow)['Text'])
+ with
self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog:
- gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D2"}))
- self.assertEqual('Result4', get_state_as_dict(xPosWindow)['Text'])
+ # Only top is selected
+ self.assertEqual('false',
get_state_as_dict(xDialog.getChild('left'))['Selected'])
+ self.assertEqual('false',
get_state_as_dict(xDialog.getChild('right'))['Selected'])
+ self.assertEqual('false',
get_state_as_dict(xDialog.getChild('bottom'))['Selected'])
+ self.assertEqual('true',
get_state_as_dict(xDialog.getChild('top'))['Selected'])
- # Change formula syntax back to "Calc A1"
- with
self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as
xDialogOpt:
+ gridwin.executeAction("SELECT", mkPropertyValues({"CELL":
"C2"}))
- xPages = xDialogOpt.getChild("pages")
- xCalcEntry = xPages.getChild('3')
- xCalcEntry.executeAction("EXPAND", tuple())
- xCalcFormulaEntry = xCalcEntry.getChild('4')
- xCalcFormulaEntry.executeAction("SELECT", tuple())
+ # Without the fix in place, this test would have failed with
+ # AssertionError: 'Result3' != 'R2C3'
+ self.assertEqual('Result3',
get_state_as_dict(xPosWindow)['Text'])
- xFormulaSyntax = xDialogOpt.getChild('formulasyntax')
- select_by_text(xFormulaSyntax, "Calc A1")
+ gridwin.executeAction("SELECT", mkPropertyValues({"CELL":
"D2"}))
+ self.assertEqual('Result4',
get_state_as_dict(xPosWindow)['Text'])
+ finally:
+ self.change_formula_syntax("Calc A1")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
