diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-29 11:44:54 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-29 15:10:03 +0200 |
| commit | 5b8a13486d3809066e663549879c209992d5479d (patch) | |
| tree | 8c2701d8827e24eb7f36eb707c20905c41653485 /sc/qa/uitest/protect | |
| parent | d0172f785a5973dbe5ea585eabfa7a4671b38775 (diff) | |
uitest: combine execute_dialog_through_command methods
Change-Id: Iaa03d37a9ac3862b8cb08a81e37a611632433880
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118077
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc/qa/uitest/protect')
| -rw-r--r-- | sc/qa/uitest/protect/protectSheet.py | 6 | ||||
| -rw-r--r-- | sc/qa/uitest/protect/protectSpreadsheet.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/qa/uitest/protect/protectSheet.py b/sc/qa/uitest/protect/protectSheet.py index 12b0cd336f05..353da927d1f6 100644 --- a/sc/qa/uitest/protect/protectSheet.py +++ b/sc/qa/uitest/protect/protectSheet.py @@ -21,7 +21,7 @@ class protectSheet(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #enter password - lock - with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Protect") as xDialog: xprotect = xDialog.getChild("protect") xpassword1 = xDialog.getChild("password1") xpassword2 = xDialog.getChild("password2") @@ -33,7 +33,7 @@ class protectSheet(UITestCase): #Unlock - with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Protect") as xDialog: xpass1ed = xDialog.getChild("pass1ed") xpass1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"})) @@ -43,7 +43,7 @@ class protectSheet(UITestCase): self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), "A") # test cancel button - with self.ui_test.execute_dialog_through_command_guarded(".uno:Protect", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:Protect", close_button="cancel"): pass enter_text_to_cell(gridwin, "B2", "B") diff --git a/sc/qa/uitest/protect/protectSpreadsheet.py b/sc/qa/uitest/protect/protectSpreadsheet.py index 53424e415073..8659dc621e82 100644 --- a/sc/qa/uitest/protect/protectSpreadsheet.py +++ b/sc/qa/uitest/protect/protectSpreadsheet.py @@ -21,7 +21,7 @@ class protectSpreadsheet(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #enter password - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToolProtectionDocument") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToolProtectionDocument") as xDialog: xpass1ed = xDialog.getChild("pass1ed") xconfirm1ed = xDialog.getChild("confirm1ed") @@ -29,7 +29,7 @@ class protectSpreadsheet(UITestCase): xconfirm1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"})) #Verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToolProtectionDocument", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToolProtectionDocument", close_button="cancel") as xDialog: xpass1ed = xDialog.getChild("pass1ed") xpass1ed.executeAction("TYPE", mkPropertyValues({"TEXT":"aa"})) |