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 | |
| 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')
124 files changed, 304 insertions, 304 deletions
diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py b/sc/qa/uitest/autofilter/autofilterBugs.py index 5f344536da15..8a5250ae62c0 100644 --- a/sc/qa/uitest/autofilter/autofilterBugs.py +++ b/sc/qa/uitest/autofilter/autofilterBugs.py @@ -16,7 +16,7 @@ class autofilter(UITestCase): #autofilter exist self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel"): pass #autofilter still exist @@ -35,13 +35,13 @@ class autofilter(UITestCase): enter_text_to_cell(xGridWindow, "B3", "d") xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"): pass xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A3"})) self.xUITest.executeCommand(".uno:SelectRow") #select two rows - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"): + with self.ui_test.execute_dialog_through_command(".uno:DataSort"): pass #autofilter still exist @@ -59,7 +59,7 @@ class autofilter(UITestCase): xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:E6"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"): + with self.ui_test.execute_dialog_through_command(".uno:DataSort"): pass #autofilter still exist diff --git a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py index ccfd0e36fe56..a266925f1c00 100644 --- a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py +++ b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py @@ -97,7 +97,7 @@ class tdf117276_autofilter_reset(UITestCase): xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B6"})) # 2. switch on auto-filter - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"): pass # autofilter still exist diff --git a/sc/qa/uitest/autofilter/tdf126306.py b/sc/qa/uitest/autofilter/tdf126306.py index 08ca30974354..6423760d2a60 100644 --- a/sc/qa/uitest/autofilter/tdf126306.py +++ b/sc/qa/uitest/autofilter/tdf126306.py @@ -34,7 +34,7 @@ class tdf126306(UITestCase): xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A15"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"): pass self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True) diff --git a/sc/qa/uitest/autofilter/tdf140754.py b/sc/qa/uitest/autofilter/tdf140754.py index bd488a7f80b4..1e539e93c5e8 100644 --- a/sc/qa/uitest/autofilter/tdf140754.py +++ b/sc/qa/uitest/autofilter/tdf140754.py @@ -16,7 +16,7 @@ class tdf140754(UITestCase): with self.ui_test.load_file(get_url_for_data_file("tdf140754.ods")) as calc_doc: #Make sure 'multi-threaded calculation' is enabled - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') diff --git a/sc/qa/uitest/autofilter/tdf36383.py b/sc/qa/uitest/autofilter/tdf36383.py index 46bc1c915317..26003ebcf9fb 100644 --- a/sc/qa/uitest/autofilter/tdf36383.py +++ b/sc/qa/uitest/autofilter/tdf36383.py @@ -42,7 +42,7 @@ class tdf36383(UITestCase): self.assertFalse(row.getPropertyValue("IsVisible")) #row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -52,7 +52,7 @@ class tdf36383(UITestCase): self.assertFalse(row.getPropertyValue("IsVisible")) #optimal row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetOptimalRowHeight"): + with self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight"): pass self.assertFalse(row.getPropertyValue("IsVisible")) diff --git a/sc/qa/uitest/autofilter/tdf46062.py b/sc/qa/uitest/autofilter/tdf46062.py index bc941ef0fccc..065279e686ab 100644 --- a/sc/qa/uitest/autofilter/tdf46062.py +++ b/sc/qa/uitest/autofilter/tdf46062.py @@ -24,7 +24,7 @@ class tdf46062(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataFilterAutoFilter", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:DataFilterAutoFilter", close_button="yes"): pass gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"})) diff --git a/sc/qa/uitest/calc_tests/CellDropDownItems.py b/sc/qa/uitest/calc_tests/CellDropDownItems.py index def8a81a515a..ce443cda3283 100644 --- a/sc/qa/uitest/calc_tests/CellDropDownItems.py +++ b/sc/qa/uitest/calc_tests/CellDropDownItems.py @@ -22,7 +22,7 @@ class CellDropDownItems(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C10"})) #Open Validation Dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: #Select List option xallow = xDialog.getChild("allow") diff --git a/sc/qa/uitest/calc_tests/autofill.py b/sc/qa/uitest/calc_tests/autofill.py index ee0d549fee7b..665410da2d48 100644 --- a/sc/qa/uitest/calc_tests/autofill.py +++ b/sc/qa/uitest/calc_tests/autofill.py @@ -19,7 +19,7 @@ class CalcAutofill(UITestCase): gridwin = xCalcDoc.getChild("grid_window") #Select cell A12 and drag the fill handle in the bottom right corner of the cell down to A18 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A12:A18"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"): + with self.ui_test.execute_dialog_through_command(".uno:FillSeries"): pass #Compare with the content in the right next column self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 11).getValue(), 18.34) @@ -31,7 +31,7 @@ class CalcAutofill(UITestCase): self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 17).getValue(), 24.34) #Select cell A12 and drag the fill handle in the bottom right corner of the cell up to A6 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A6:A12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xup = xDialog.getChild("up") xincrement = xDialog.getChild("increment") xup.executeAction("CLICK", tuple()) @@ -49,7 +49,7 @@ class CalcAutofill(UITestCase): #Continue with the next cells with grey background gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M12:M18"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"): + with self.ui_test.execute_dialog_through_command(".uno:FillSeries"): pass #Compare with the content in the right next column self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40") @@ -61,7 +61,7 @@ class CalcAutofill(UITestCase): self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 17).getString(), "12abc46") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M6:M12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xup = xDialog.getChild("up") xincrement = xDialog.getChild("increment") xup.executeAction("CLICK", tuple()) @@ -78,7 +78,7 @@ class CalcAutofill(UITestCase): self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P12:P18"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"): + with self.ui_test.execute_dialog_through_command(".uno:FillSeries"): pass #Compare with the content in the right next column self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 11).getString(), "10.64.127.7") @@ -90,7 +90,7 @@ class CalcAutofill(UITestCase): self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 17).getString(), "10.64.127.13") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P6:P12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xup = xDialog.getChild("up") xincrement = xDialog.getChild("increment") xup.executeAction("CLICK", tuple()) @@ -114,7 +114,7 @@ class CalcAutofill(UITestCase): enter_text_to_cell(gridwin, "A1", "1st") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B2"})) gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xautofill = xDialog.getChild("autofill") xautofill.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "1st") diff --git a/sc/qa/uitest/calc_tests/calcSheetDelete.py b/sc/qa/uitest/calc_tests/calcSheetDelete.py index b52dc67e3dae..c3e28bee2d0c 100644 --- a/sc/qa/uitest/calc_tests/calcSheetDelete.py +++ b/sc/qa/uitest/calc_tests/calcSheetDelete.py @@ -22,12 +22,12 @@ class calcSheetDelete(UITestCase): xGridWindow.executeAction("SELECT", mkPropertyValues({"CELL": "L12"})) nrSheets = document.Sheets.getCount() #default number - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass self.assertEqual(document.Sheets.getCount(), nrSheets + 1) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"): pass xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit') xToolkit.processEventsToIdle() @@ -47,10 +47,10 @@ class calcSheetDelete(UITestCase): nrSheets = document.Sheets.getCount() #default number of sheets - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit') xToolkit.processEventsToIdle() @@ -60,7 +60,7 @@ class calcSheetDelete(UITestCase): xGridWindow = xCalcDoc.getChild("grid_window") enter_text_to_cell(xGridWindow, "B2", "abcd") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"): pass self.assertEqual(document.Sheets.getCount(), nrSheets + 1) @@ -81,7 +81,7 @@ class calcSheetDelete(UITestCase): nrSheets = document.Sheets.getCount() #default number i = 0 while i < 6: - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass i = i + 1 self.assertEqual(document.Sheets.getCount(), nrSheets + 6) @@ -91,7 +91,7 @@ class calcSheetDelete(UITestCase): self.xUITest.executeCommand(".uno:JumpToNextTableSel") #select next sheet i = i + 1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"): pass xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit') @@ -114,7 +114,7 @@ class calcSheetDelete(UITestCase): nrSheets = document.Sheets.getCount() #default number i = 0 while i < 100: - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass i = i + 1 xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit') @@ -126,7 +126,7 @@ class calcSheetDelete(UITestCase): self.xUITest.executeCommand(".uno:JumpToNextTableSel") #select next sheet i = i + 1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"): pass self.assertEqual(document.Sheets.getCount(), nrSheets) diff --git a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py index e41871b135b2..129488b50feb 100644 --- a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py +++ b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py @@ -22,7 +22,7 @@ class CalcCellBackgroundColorSelector(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Numbers # click on color btn @@ -148,7 +148,7 @@ class CalcCellBackgroundColorSelector(UITestCase): #select cell A5 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Numbers # click on color btn @@ -177,7 +177,7 @@ class CalcCellBackgroundColorSelector(UITestCase): #select cell D3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D3"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Numbers # click on color btn diff --git a/sc/qa/uitest/calc_tests/columns.py b/sc/qa/uitest/calc_tests/columns.py index ff1afd948caf..2466366762c1 100644 --- a/sc/qa/uitest/calc_tests/columns.py +++ b/sc/qa/uitest/calc_tests/columns.py @@ -21,7 +21,7 @@ class CalcColumns(UITestCase): #select A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #column width - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xdefault = xDialog.getChild("default") self.assertEqual(get_state_as_dict(xdefault)["Selected"], "true") #default selected @@ -40,7 +40,7 @@ class CalcColumns(UITestCase): xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"})) # Click Ok #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth", close_button="cancel") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -57,7 +57,7 @@ class CalcColumns(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1", "EXTEND":"1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xdefault = xDialog.getChild("default") #write your own value @@ -67,12 +67,12 @@ class CalcColumns(UITestCase): # Click Ok #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -89,7 +89,7 @@ class CalcColumns(UITestCase): #select A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #column width - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -105,7 +105,7 @@ class CalcColumns(UITestCase): self.xUITest.executeCommand(".uno:Paste") #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -172,7 +172,7 @@ class CalcColumns(UITestCase): #select C1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"})) #column width - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -181,7 +181,7 @@ class CalcColumns(UITestCase): #select D1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"})) #column width - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -190,7 +190,7 @@ class CalcColumns(UITestCase): #select E1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E1"})) #column width - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -203,32 +203,32 @@ class CalcColumns(UITestCase): self.xUITest.executeCommand(".uno:InsertColumnsBefore") #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "2.0003 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "3.0004 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "F1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "G1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "2.0003 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "H1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ColumnWidth") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "3.0004 cm") diff --git a/sc/qa/uitest/calc_tests/formatCells.py b/sc/qa/uitest/calc_tests/formatCells.py index 4d4df4ac8f26..f0a6d7e0b0cc 100644 --- a/sc/qa/uitest/calc_tests/formatCells.py +++ b/sc/qa/uitest/calc_tests/formatCells.py @@ -21,7 +21,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category @@ -45,7 +45,7 @@ class formatCell(UITestCase): #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category @@ -76,7 +76,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #tab Font xSizeFont = xDialog.getChild("westsizelb-cjk") @@ -99,7 +99,7 @@ class formatCell(UITestCase): #Verify - select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #tab Font xSizeFont = xDialog.getChild("westsizelb-cjk") @@ -128,7 +128,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") #tab Font Effects xRelief = xDialog.getChild("relieflb") @@ -148,7 +148,7 @@ class formatCell(UITestCase): #Verify- select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -177,7 +177,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") #tab Alignment comboboxHorzAlign = xDialog.getChild("comboboxHorzAlign") @@ -199,7 +199,7 @@ class formatCell(UITestCase): #Verify- select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") comboboxHorzAlign = xDialog.getChild("comboboxHorzAlign") @@ -228,7 +228,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") #tab Asian typography xcheckForbidList = xDialog.getChild("checkForbidList") @@ -236,7 +236,7 @@ class formatCell(UITestCase): #Verify- select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xcheckForbidList = xDialog.getChild("checkForbidList") @@ -257,7 +257,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") #tab Borders @@ -307,7 +307,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") #tab Borders xsync = xDialog.getChild("sync") @@ -337,7 +337,7 @@ class formatCell(UITestCase): # Verify select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") #tab Borders xsync = xDialog.getChild("sync") @@ -364,7 +364,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Cell protection xcheckHideFormula = xDialog.getChild("checkHideFormula") @@ -378,7 +378,7 @@ class formatCell(UITestCase): # Verify select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Borders xcheckHideFormula = xDialog.getChild("checkHideFormula") @@ -400,7 +400,7 @@ class formatCell(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") #tab Alignment xspinDegrees = xDialog.getChild("spinDegrees") diff --git a/sc/qa/uitest/calc_tests/mergedRowsColumns.py b/sc/qa/uitest/calc_tests/mergedRowsColumns.py index f0c6b5ba9ac2..a33fb44c7580 100644 --- a/sc/qa/uitest/calc_tests/mergedRowsColumns.py +++ b/sc/qa/uitest/calc_tests/mergedRowsColumns.py @@ -64,7 +64,7 @@ class mergedRowsColumns(UITestCase): #move the content of the hidden cells into the first cell gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("move-cells-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2 3") @@ -76,7 +76,7 @@ class mergedRowsColumns(UITestCase): #keep the contents of the hidden cells gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("keep-content-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2") @@ -89,7 +89,7 @@ class mergedRowsColumns(UITestCase): #Empty the contents of the hidden cells gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A11:A12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("move-cells-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getString(), "2 3") @@ -102,7 +102,7 @@ class mergedRowsColumns(UITestCase): #A21-A22 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A21:A22"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("keep-content-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 20).getString(), "2") @@ -115,7 +115,7 @@ class mergedRowsColumns(UITestCase): #A30-A32 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A30:A32"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("keep-content-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 31).getString(), "thisisbad") @@ -126,7 +126,7 @@ class mergedRowsColumns(UITestCase): #J12-K12 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "J12:K12"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("keep-content-radio") xMoveCells.executeAction("CLICK", tuple()) @@ -139,7 +139,7 @@ class mergedRowsColumns(UITestCase): #J22-K22 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "J22:K22"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ToggleMergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ToggleMergeCells") as xDialog: xMoveCells = xDialog.getChild("keep-content-radio") xMoveCells.executeAction("CLICK", tuple()) self.assertEqual(get_cell_by_position(calc_doc, 0, 9, 21).getString(), "2") diff --git a/sc/qa/uitest/calc_tests/printRange.py b/sc/qa/uitest/calc_tests/printRange.py index bdd85a81749a..c58469e032e7 100644 --- a/sc/qa/uitest/calc_tests/printRange.py +++ b/sc/qa/uitest/calc_tests/printRange.py @@ -93,7 +93,7 @@ class printRange(UITestCase): self.ui_test.close_dialog_through_button(xOK) #Copy sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move"): + with self.ui_test.execute_dialog_through_command(".uno:Move"): pass #Verify Print Range dialog on new sheet self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea") diff --git a/sc/qa/uitest/calc_tests/rows.py b/sc/qa/uitest/calc_tests/rows.py index 8b1c47efb840..37810b80241a 100644 --- a/sc/qa/uitest/calc_tests/rows.py +++ b/sc/qa/uitest/calc_tests/rows.py @@ -21,7 +21,7 @@ class CalcRows(UITestCase): #select A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") xdefault = xDialog.getChild("default") self.assertEqual(get_state_as_dict(xdefault)["Selected"], "true") #default selected @@ -40,7 +40,7 @@ class CalcRows(UITestCase): xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"})) # Click Ok #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight", close_button="cancel") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -57,7 +57,7 @@ class CalcRows(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3", "EXTEND":"1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") xdefault = xDialog.getChild("default") #write your own value @@ -67,12 +67,12 @@ class CalcRows(UITestCase): # Click Ok #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -90,7 +90,7 @@ class CalcRows(UITestCase): #select A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -106,7 +106,7 @@ class CalcRows(UITestCase): self.xUITest.executeCommand(".uno:Paste") #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") @@ -173,7 +173,7 @@ class CalcRows(UITestCase): #select A3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) #row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) @@ -187,12 +187,12 @@ class CalcRows(UITestCase): #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A4"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight") as xDialog: xvalue = xDialog.getChild("value") self.assertEqual(get_state_as_dict(xvalue)["Text"], "1.0001 cm") diff --git a/sc/qa/uitest/calc_tests/sheetRename.py b/sc/qa/uitest/calc_tests/sheetRename.py index 8c54ee098909..41d28583da02 100644 --- a/sc/qa/uitest/calc_tests/sheetRename.py +++ b/sc/qa/uitest/calc_tests/sheetRename.py @@ -14,11 +14,11 @@ class sheetRename(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog: xname_entry = xDialog.getChild("name_entry") xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"})) #Verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable", close_button="cancel") as xDialog: xname_entry = xDialog.getChild("name_entry") self.assertEqual(get_state_as_dict(xname_entry)["Text"], "NewName") @@ -29,7 +29,7 @@ class sheetRename(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable", close_button="") as xDialog: xname_entry = xDialog.getChild("name_entry") nameVal = get_state_as_dict(xname_entry)["Text"] xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName**"})) @@ -42,7 +42,7 @@ class sheetRename(UITestCase): self.ui_test.close_dialog_through_button(xCancelBtn) #Verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog: xname_entry = xDialog.getChild("name_entry") self.assertEqual(get_state_as_dict(xname_entry)["Text"], nameVal) diff --git a/sc/qa/uitest/calc_tests/zoom.py b/sc/qa/uitest/calc_tests/zoom.py index d1a8f0853356..6a0fd1670e06 100644 --- a/sc/qa/uitest/calc_tests/zoom.py +++ b/sc/qa/uitest/calc_tests/zoom.py @@ -22,18 +22,18 @@ class calcZoom(UITestCase): self.assertEqual(get_state_as_dict(gridwin)["Zoom"], "100") #dialog View-Zoom-Zoom - with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog: #select fit weight & height - OK - open and verify fitwandh = xDialog.getChild("fitwandh") fitwandh.executeAction("CLICK",tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog: #select fit weight - OK - open and verify fitw = xDialog.getChild("fitw") fitw.executeAction("CLICK",tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog: #select 100% & Automatic - OK - open and verify x100pc = xDialog.getChild("100pc") x100pc.executeAction("CLICK", tuple()) @@ -43,7 +43,7 @@ class calcZoom(UITestCase): gridwin.executeAction("SET", mkPropertyValues({"ZOOM": "103"})) self.assertEqual(get_state_as_dict(gridwin)["Zoom"], "103") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Zoom") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Zoom") as xDialog: #select variable option and make zoom 100% again - OK - open and verify zoomsb = xDialog.getChild("zoomsb") self.assertEqual(get_state_as_dict(zoomsb)["Text"], "103%") diff --git a/sc/qa/uitest/calc_tests2/dataform.py b/sc/qa/uitest/calc_tests2/dataform.py index 8d9acb761b4c..617abfc73932 100644 --- a/sc/qa/uitest/calc_tests2/dataform.py +++ b/sc/qa/uitest/calc_tests2/dataform.py @@ -15,7 +15,7 @@ class dataform(UITestCase): gridwin = xCalcDoc.getChild("grid_window") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A10"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataForm", close_button="close"): + with self.ui_test.execute_dialog_through_command(".uno:DataForm", close_button="close"): pass self.ui_test.close_doc() diff --git a/sc/qa/uitest/calc_tests2/tdf114992.py b/sc/qa/uitest/calc_tests2/tdf114992.py index 304ca7a8ecce..b0df0321249e 100644 --- a/sc/qa/uitest/calc_tests2/tdf114992.py +++ b/sc/qa/uitest/calc_tests2/tdf114992.py @@ -15,7 +15,7 @@ class tdf114992(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes"): + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes"): pass self.assertEqual(calc_doc.Sheets.getCount(), 1) diff --git a/sc/qa/uitest/calc_tests2/tdf117367.py b/sc/qa/uitest/calc_tests2/tdf117367.py index 8b0c3e1698da..6295ce8781a7 100644 --- a/sc/qa/uitest/calc_tests2/tdf117367.py +++ b/sc/qa/uitest/calc_tests2/tdf117367.py @@ -22,7 +22,7 @@ class tdf117367(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B4"})) #Right-click - Merge cells /Select all three options - with self.ui_test.execute_dialog_through_command_guarded(".uno:MergeCells") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:MergeCells") as xDialog: xmoveCellsRadio = xDialog.getChild("move-cells-radio") xemptyCellsRadio = xDialog.getChild("empty-cells-radio") xkeepContentRadio = xDialog.getChild("keep-content-radio") diff --git a/sc/qa/uitest/calc_tests2/tdf126577.py b/sc/qa/uitest/calc_tests2/tdf126577.py index d8a2fda1ffbc..8eef03b9c070 100644 --- a/sc/qa/uitest/calc_tests2/tdf126577.py +++ b/sc/qa/uitest/calc_tests2/tdf126577.py @@ -19,7 +19,7 @@ class tdf126577(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A20"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: self.assertEqual("true", get_state_as_dict(xDialog.getChild("down"))['Checked']) self.assertEqual("true", get_state_as_dict(xDialog.getChild("linear"))['Checked']) diff --git a/sc/qa/uitest/calc_tests2/tdf37623.py b/sc/qa/uitest/calc_tests2/tdf37623.py index a22a9fc0df45..0193186f3ea5 100644 --- a/sc/qa/uitest/calc_tests2/tdf37623.py +++ b/sc/qa/uitest/calc_tests2/tdf37623.py @@ -16,7 +16,7 @@ class tdf37623(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A6"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xautofill = xDialog.getChild("autofill") xautofill.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests2/tdf46138.py b/sc/qa/uitest/calc_tests2/tdf46138.py index 0780db3d02bb..ed05962467f6 100644 --- a/sc/qa/uitest/calc_tests2/tdf46138.py +++ b/sc/qa/uitest/calc_tests2/tdf46138.py @@ -19,7 +19,7 @@ class tdf46138(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:SelectColumn") #select 'edit'>'fill'>'series'>Starting Value '1' then "OK", - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xStart = xDialog.getChild("startValue") xStart.executeAction("TYPE", mkPropertyValues({"TEXT":"1"})) self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "1") diff --git a/sc/qa/uitest/calc_tests2/tdf51700.py b/sc/qa/uitest/calc_tests2/tdf51700.py index a798f247e841..172705b6c57e 100644 --- a/sc/qa/uitest/calc_tests2/tdf51700.py +++ b/sc/qa/uitest/calc_tests2/tdf51700.py @@ -26,7 +26,7 @@ class tdf51700(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:SelectColumn") # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xcomma = xDialog.getChild("comma") if (get_state_as_dict(xcomma)["Selected"]) == "false": xcomma.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests3/clearCells.py b/sc/qa/uitest/calc_tests3/clearCells.py index 91db83d5262c..49cd1dab059c 100644 --- a/sc/qa/uitest/calc_tests3/clearCells.py +++ b/sc/qa/uitest/calc_tests3/clearCells.py @@ -22,7 +22,7 @@ class clearCells(UITestCase): enter_text_to_cell(gridwin, "A2", "1") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -64,7 +64,7 @@ class clearCells(UITestCase): enter_text_to_cell(gridwin, "A2", "1") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -106,7 +106,7 @@ class clearCells(UITestCase): enter_text_to_cell(gridwin, "A2", "1") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -147,7 +147,7 @@ class clearCells(UITestCase): enter_text_to_cell(gridwin, "A2", "=A1+1") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -190,7 +190,7 @@ class clearCells(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) self.xUITest.executeCommand(".uno:Bold") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -219,7 +219,7 @@ class clearCells(UITestCase): #Verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #tab Font @@ -242,7 +242,7 @@ class clearCells(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) self.xUITest.executeCommand(".uno:Bold") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete") as xDialog: xdeleteall = xDialog.getChild("deleteall") xtext = xDialog.getChild("text") xdatetime = xDialog.getChild("datetime") @@ -270,7 +270,7 @@ class clearCells(UITestCase): enter_text_to_cell(gridwin, "A2", "1") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Delete", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Delete", close_button="cancel") as xDialog: xdeleteall = xDialog.getChild("deleteall") if (get_state_as_dict(xdeleteall)["Selected"]) == "false": diff --git a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py index 597ad439fa67..65aaf55b2bf2 100644 --- a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py +++ b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py @@ -17,7 +17,7 @@ class insertQrCode(UITestCase): document = self.ui_test.get_component() # cancel the dialog without doing anything - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode", close_button="cancel") as xDialog: xURL = xDialog.getChild("edit_text") type_text(xURL, "www.libreoffice.org") @@ -26,7 +26,7 @@ class insertQrCode(UITestCase): document.Sheets.getByIndex(0).DrawPage.getByIndex(0) # Reopen the dialog box - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: # Get elements in the Dialog Box xURL = xDialog.getChild("edit_text") @@ -51,7 +51,7 @@ class insertQrCode(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertQrCode") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: xURL = xDialog.getChild("edit_text") xECC_Low = xDialog.getChild("button_low") diff --git a/sc/qa/uitest/calc_tests3/tdf57274.py b/sc/qa/uitest/calc_tests3/tdf57274.py index 4937a9b42afb..564060d208a2 100644 --- a/sc/qa/uitest/calc_tests3/tdf57274.py +++ b/sc/qa/uitest/calc_tests3/tdf57274.py @@ -22,7 +22,7 @@ class tdf57274(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B6:E6"})) self.xUITest.executeCommand(".uno:Copy") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B11"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial", close_button="") as xDialog: #We paste here using Paste Special with 'Link' Checkbox activated xLink = xDialog.getChild("link") xLink.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests3/tdf62267.py b/sc/qa/uitest/calc_tests3/tdf62267.py index 370eefb3ca5e..6a569e0f1098 100644 --- a/sc/qa/uitest/calc_tests3/tdf62267.py +++ b/sc/qa/uitest/calc_tests3/tdf62267.py @@ -23,12 +23,12 @@ class tdf62267(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:Copy") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: #it's the default - text, numbers and dates pass #--> Cell formatting should stay as before - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr: # check that we have exactly 1 conditional format diff --git a/sc/qa/uitest/calc_tests3/tdf63805.py b/sc/qa/uitest/calc_tests3/tdf63805.py index 1eebbc898420..bcbf59804675 100644 --- a/sc/qa/uitest/calc_tests3/tdf63805.py +++ b/sc/qa/uitest/calc_tests3/tdf63805.py @@ -24,7 +24,7 @@ class tdf63805(UITestCase): #2 - Select A1:A20 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A20"})) #3 - Edit -> fill -> Series -> Down - Date-Month-Increment=1 <ok> - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries"): + with self.ui_test.execute_dialog_through_command(".uno:FillSeries"): pass #5 -Expected: All Cells show last day of month / Actual: some months skipped self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getValue(), 41213) diff --git a/sc/qa/uitest/calc_tests3/tdf65856.py b/sc/qa/uitest/calc_tests3/tdf65856.py index 56c1bc397c19..e66a02597af1 100644 --- a/sc/qa/uitest/calc_tests3/tdf65856.py +++ b/sc/qa/uitest/calc_tests3/tdf65856.py @@ -21,7 +21,7 @@ class tdf65856(UITestCase): self.xUITest.executeCommand(".uno:Copy") #mark cell D1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: xmove_right = xDialog.getChild("move_right") xmove_right.executeAction("CLICK", tuple()) @@ -53,7 +53,7 @@ class tdf65856(UITestCase): self.xUITest.executeCommand(".uno:Copy") #mark cell B2 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: xmove_right = xDialog.getChild("move_right") xmove_right.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests3/tdf69450.py b/sc/qa/uitest/calc_tests3/tdf69450.py index e5be3998ed5e..615aa96497a3 100644 --- a/sc/qa/uitest/calc_tests3/tdf69450.py +++ b/sc/qa/uitest/calc_tests3/tdf69450.py @@ -23,7 +23,7 @@ class tdf69450(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:Copy") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: xtext = xDialog.getChild("text") xnumbers = xDialog.getChild("numbers") @@ -43,7 +43,7 @@ class tdf69450(UITestCase): self.xUITest.executeCommand(".uno:Bold") self.xUITest.executeCommand(".uno:Copy") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial"): + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial"): pass #check B1 text diff --git a/sc/qa/uitest/calc_tests3/tdf69981.py b/sc/qa/uitest/calc_tests3/tdf69981.py index c553d2eb6fae..c6dd94a42285 100644 --- a/sc/qa/uitest/calc_tests3/tdf69981.py +++ b/sc/qa/uitest/calc_tests3/tdf69981.py @@ -17,7 +17,7 @@ class tdf69981(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -31,7 +31,7 @@ class tdf69981(UITestCase): #Select A2:A7 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A7"})) #Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: xtab = xDialog.getChild("tab") xcomma = xDialog.getChild("comma") xtab.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests3/tdf73006.py b/sc/qa/uitest/calc_tests3/tdf73006.py index 76e279c4757f..0dfd743a24ee 100644 --- a/sc/qa/uitest/calc_tests3/tdf73006.py +++ b/sc/qa/uitest/calc_tests3/tdf73006.py @@ -24,7 +24,7 @@ class tdf73006(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:SelectColumn") # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xspace = xDialog.getChild("space") if (get_state_as_dict(xspace)["Selected"]) == "false": xspace.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests3/tdf79983.py b/sc/qa/uitest/calc_tests3/tdf79983.py index 82fe9056f597..347786e5a27f 100644 --- a/sc/qa/uitest/calc_tests3/tdf79983.py +++ b/sc/qa/uitest/calc_tests3/tdf79983.py @@ -25,7 +25,7 @@ class tdf79983(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"})) #Tools / Options / LibreOffice Calc / Sort Lists - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') # Calc @@ -45,7 +45,7 @@ class tdf79983(UITestCase): enter_text_to_cell(gridwin, "A1", "AAA") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"})) #fill down - with self.ui_test.execute_dialog_through_command_guarded(".uno:FillSeries") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FillSeries") as xDialog: xautofill = xDialog.getChild("autofill") xautofill.executeAction("CLICK", tuple()) #verify diff --git a/sc/qa/uitest/calc_tests3/tdf82398.py b/sc/qa/uitest/calc_tests3/tdf82398.py index 1e3b4268e2bf..c5d453476874 100644 --- a/sc/qa/uitest/calc_tests3/tdf82398.py +++ b/sc/qa/uitest/calc_tests3/tdf82398.py @@ -27,7 +27,7 @@ class tdf82398(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"})) self.xUITest.executeCommand(".uno:NumberFormatDate") # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xother = xDialog.getChild("other") xinputother = xDialog.getChild("inputother") diff --git a/sc/qa/uitest/calc_tests4/tdf131170.py b/sc/qa/uitest/calc_tests4/tdf131170.py index 508fc7d97aa3..0ee1552a0c46 100644 --- a/sc/qa/uitest/calc_tests4/tdf131170.py +++ b/sc/qa/uitest/calc_tests4/tdf131170.py @@ -13,7 +13,7 @@ class tdf131170(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineLabelRange") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineLabelRange") as xDialog: xRange = xDialog.getChild("range") self.assertEqual(4, len(xRange.getChildren())) diff --git a/sc/qa/uitest/calc_tests4/tdf85403.py b/sc/qa/uitest/calc_tests4/tdf85403.py index fb17610d4839..73859c38410f 100644 --- a/sc/qa/uitest/calc_tests4/tdf85403.py +++ b/sc/qa/uitest/calc_tests4/tdf85403.py @@ -22,7 +22,7 @@ class tdf85403(UITestCase): #putting a new SUM(A1) in C1 will show 123 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns"): + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns"): pass #Verify diff --git a/sc/qa/uitest/calc_tests4/tdf85979.py b/sc/qa/uitest/calc_tests4/tdf85979.py index 1e2e6bb63962..df5f97315289 100644 --- a/sc/qa/uitest/calc_tests4/tdf85979.py +++ b/sc/qa/uitest/calc_tests4/tdf85979.py @@ -20,7 +20,7 @@ class tdf85979(UITestCase): #(I selected C1 to C5, then Text to Columns, unselected "Tab" and selected "Space") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xspace = xDialog.getChild("space") if (get_state_as_dict(xspace)["Selected"]) == "false": xspace.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests4/tdf86253.py b/sc/qa/uitest/calc_tests4/tdf86253.py index eb815f5080b7..66456523dfac 100644 --- a/sc/qa/uitest/calc_tests4/tdf86253.py +++ b/sc/qa/uitest/calc_tests4/tdf86253.py @@ -19,7 +19,7 @@ class tdf86253(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) self.xUITest.executeCommand(".uno:Copy") gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C17"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: xtext = xDialog.getChild("text") xnumbers = xDialog.getChild("numbers") @@ -34,7 +34,7 @@ class tdf86253(UITestCase): #--> Cell formatting for C1:C17 is changed. But, if you go to "Format - Conditional Formatting - Manage", #you will see that a new formatting condition is created with the range "C1:C6", rather than "C1:C17". This is wrong behavior. - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="cancel") as xCondFormatMgr: # check that we have exactly 1 conditional format and range is C1:C17 diff --git a/sc/qa/uitest/calc_tests4/tdf88999.py b/sc/qa/uitest/calc_tests4/tdf88999.py index 40300f8c31c6..e04957336609 100644 --- a/sc/qa/uitest/calc_tests4/tdf88999.py +++ b/sc/qa/uitest/calc_tests4/tdf88999.py @@ -23,7 +23,7 @@ class tdf88999(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category diff --git a/sc/qa/uitest/calc_tests4/tdf89907.py b/sc/qa/uitest/calc_tests4/tdf89907.py index aaa6b7cc4523..a88250a6a8a9 100644 --- a/sc/qa/uitest/calc_tests4/tdf89907.py +++ b/sc/qa/uitest/calc_tests4/tdf89907.py @@ -29,7 +29,7 @@ class tdf89907(UITestCase): #Optimal Width self.xUITest.executeCommand(".uno:SetOptimalColumnWidthDirect") # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xother = xDialog.getChild("other") xinputother = xDialog.getChild("inputother") if (get_state_as_dict(xother)["Selected"]) == "false": diff --git a/sc/qa/uitest/calc_tests4/tdf92423.py b/sc/qa/uitest/calc_tests4/tdf92423.py index f374a0d2f9ff..c282895fd1cf 100644 --- a/sc/qa/uitest/calc_tests4/tdf92423.py +++ b/sc/qa/uitest/calc_tests4/tdf92423.py @@ -19,7 +19,7 @@ class tdf92423(UITestCase): document = self.ui_test.get_component() #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -48,7 +48,7 @@ class tdf92423(UITestCase): gridWinState = get_state_as_dict(gridwin) self.assertEqual(gridWinState["MarkedArea"], "Sheet1.A7:Sheet1.A9") # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns") as xDialog: xSemicolon = xDialog.getChild("semicolon") #check semicolon checkbox if (get_state_as_dict(xSemicolon)["Selected"]) == "false": xSemicolon.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests4/textToColumns.py b/sc/qa/uitest/calc_tests4/textToColumns.py index f7948ba29c87..e31c0d99dcc5 100644 --- a/sc/qa/uitest/calc_tests4/textToColumns.py +++ b/sc/qa/uitest/calc_tests4/textToColumns.py @@ -19,7 +19,7 @@ class CalcTextToColumns(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -35,7 +35,7 @@ class CalcTextToColumns(UITestCase): #Select A1:A5 on Sheet 'Dot_as_Separator' gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) #Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: #Untag Tab as separator and tag other. Put a dot into the input field next to the other checkbox xtab = xDialog.getChild("tab") xcomma = xDialog.getChild("comma") @@ -93,7 +93,7 @@ class CalcTextToColumns(UITestCase): self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 4).getString(), "random content") #verify setting in options - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -109,7 +109,7 @@ class CalcTextToColumns(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -125,7 +125,7 @@ class CalcTextToColumns(UITestCase): # Select A1:A5 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: # Untag Tab as separator and tag comma. xComma = xDialog.getChild("comma") if (get_state_as_dict(xComma)["Selected"]) == "false": @@ -178,7 +178,7 @@ class CalcTextToColumns(UITestCase): with self.ui_test.load_file(get_url_for_data_file("text_to_columns_semicolon.ods")) as calc_doc: gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -192,7 +192,7 @@ class CalcTextToColumns(UITestCase): # Select A1:A5 on Sheet gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: # Untag comma as separator and tag Semicolon xSemicolon = xDialog.getChild("semicolon") if (get_state_as_dict(xSemicolon)["Selected"]) == "false": @@ -245,7 +245,7 @@ class CalcTextToColumns(UITestCase): with self.ui_test.load_file(get_url_for_data_file("text_to_columns_space.ods")) as calc_doc: gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -259,7 +259,7 @@ class CalcTextToColumns(UITestCase): # Select A1:A5 on Sheet gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: # Untag comma as separator and tag Semicolon xSpace = xDialog.getChild("space") if (get_state_as_dict(xSpace)["Selected"]) == "false": @@ -313,7 +313,7 @@ class CalcTextToColumns(UITestCase): with self.ui_test.load_file(get_url_for_data_file("text_to_columns_pipe.ods")) as calc_doc: gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -327,7 +327,7 @@ class CalcTextToColumns(UITestCase): # Select A1:A5 on Sheet gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: # Untag comma as separator and tag Semicolon xtab = xDialog.getChild("tab") xcomma = xDialog.getChild("comma") @@ -387,7 +387,7 @@ class CalcTextToColumns(UITestCase): with self.ui_test.load_file(get_url_for_data_file("text_to_columns_pipe_space.ods")) as calc_doc: gridwin = xCalcDoc.getChild("grid_window") #Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged. - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xWriterEntry = xPages.getChild('3') # Calc @@ -401,7 +401,7 @@ class CalcTextToColumns(UITestCase): # Select A1:A5 on Sheet gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) # Data - Text to Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextToColumns", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextToColumns", close_button="") as xDialog: xtab = xDialog.getChild("tab") xcomma = xDialog.getChild("comma") xsemicolon = xDialog.getChild("semicolon") diff --git a/sc/qa/uitest/calc_tests4/trackedChanges.py b/sc/qa/uitest/calc_tests4/trackedChanges.py index e6d29efa87e2..cff17b17e204 100644 --- a/sc/qa/uitest/calc_tests4/trackedChanges.py +++ b/sc/qa/uitest/calc_tests4/trackedChanges.py @@ -47,13 +47,13 @@ class CalcTrackedChanges(UITestCase): document = self.ui_test.get_component() self.xUITest.executeCommand(".uno:TraceChangeMode") #protect dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:ProtectTraceChangeMode") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ProtectTraceChangeMode") as xDialog: xpass = xDialog.getChild("pass1ed") xpass.executeAction("TYPE", mkPropertyValues({"TEXT":"a"})) xconfirm = xDialog.getChild("confirm1ed") xconfirm.executeAction("TYPE", mkPropertyValues({"TEXT":"a"})) #verify password - with self.ui_test.execute_dialog_through_command_guarded(".uno:ProtectTraceChangeMode") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ProtectTraceChangeMode") as xDialog: xpass = xDialog.getChild("pass1ed") xpass.executeAction("TYPE", mkPropertyValues({"TEXT":"a"})) diff --git a/sc/qa/uitest/calc_tests6/autoFormat.py b/sc/qa/uitest/calc_tests6/autoFormat.py index 0744d0d397ac..5547f81956cc 100644 --- a/sc/qa/uitest/calc_tests6/autoFormat.py +++ b/sc/qa/uitest/calc_tests6/autoFormat.py @@ -18,7 +18,7 @@ class autoFormat(UITestCase): #select A1:C5 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C5"})) #AutoFormat Styles - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoFormat") as xDialog: formatlb = xDialog.getChild("formatlb") numformatcb = xDialog.getChild("numformatcb") @@ -39,7 +39,7 @@ class autoFormat(UITestCase): #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoFormat") as xDialog: formatlb = xDialog.getChild("formatlb") numformatcb = xDialog.getChild("numformatcb") diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py b/sc/qa/uitest/calc_tests6/autocorrectOptions.py index a3519a1dcd2e..158b738baf63 100644 --- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py +++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py @@ -17,7 +17,7 @@ class autocorrectOptions(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoCorrectDlg", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab replace origtext = xDialog.getChild("origtext") diff --git a/sc/qa/uitest/calc_tests6/hideShowSheet.py b/sc/qa/uitest/calc_tests6/hideShowSheet.py index f84d44fc3ac2..303c2cc5dce3 100644 --- a/sc/qa/uitest/calc_tests6/hideShowSheet.py +++ b/sc/qa/uitest/calc_tests6/hideShowSheet.py @@ -16,7 +16,7 @@ class hideShowSheet(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #insert sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass #select sheet gridwin.executeAction("SELECT", mkPropertyValues({"TABLE":"1"})) @@ -24,11 +24,11 @@ class hideShowSheet(UITestCase): #hide sheet self.xUITest.executeCommand(".uno:Hide") #show sheet Dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog: treeview = xDialog.getChild("treeview") self.assertEqual(get_state_as_dict(treeview)["Children"], "1") #insert 2nd sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass #select sheet gridwin.executeAction("SELECT", mkPropertyValues({"TABLE":"2"})) @@ -36,7 +36,7 @@ class hideShowSheet(UITestCase): #hide sheet self.xUITest.executeCommand(".uno:Hide") #show sheet Dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog: treeview = xDialog.getChild("treeview") self.assertEqual(get_state_as_dict(treeview)["Children"], "2") diff --git a/sc/qa/uitest/calc_tests6/moveCopySheet.py b/sc/qa/uitest/calc_tests6/moveCopySheet.py index 747dd77d3d69..7b038d8d9bde 100644 --- a/sc/qa/uitest/calc_tests6/moveCopySheet.py +++ b/sc/qa/uitest/calc_tests6/moveCopySheet.py @@ -16,7 +16,7 @@ class moveCopySheet(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #default - 1 sheet; select the sheet (is selected), dialog move/copy sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog: #new name = newName newName = xDialog.getChild("newName") newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) @@ -25,7 +25,7 @@ class moveCopySheet(UITestCase): #verify, the file has 2 sheets; first one "newName" is selected self.assertEqual(document.Sheets.getCount(), 2) # dialog move/copy sheet ; Move is selected; select -move to end position - ; New Name = moveName - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog: insertBefore = xDialog.getChild("insertBefore") xTreeEntry = insertBefore.getChild('2') @@ -43,7 +43,7 @@ class moveCopySheet(UITestCase): self.assertEqual(document.Sheets[1].Name, "moveName") # Verify that the cancel button does not do anything - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:Move", close_button="cancel"): pass self.assertEqual(document.Sheets.getCount(), 2) @@ -51,7 +51,7 @@ class moveCopySheet(UITestCase): self.assertEqual(document.Sheets[1].Name, "moveName") #Check copy option - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog: xCopy = xDialog.getChild("copy") xCopy.executeAction("CLICK", tuple()) sheetName = "moveName_2" diff --git a/sc/qa/uitest/calc_tests6/scenarios.py b/sc/qa/uitest/calc_tests6/scenarios.py index 0686aaabd749..e4b10b449624 100644 --- a/sc/qa/uitest/calc_tests6/scenarios.py +++ b/sc/qa/uitest/calc_tests6/scenarios.py @@ -25,7 +25,7 @@ class scenarios(UITestCase): enter_text_to_cell(xGridWindow, "B4", "1") xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B4"})) #scenarios - scenario A1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:ScenarioManager") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ScenarioManager") as xDialog: name = xDialog.getChild("name") name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) @@ -33,7 +33,7 @@ class scenarios(UITestCase): name.executeAction("TYPE", mkPropertyValues({"TEXT":"A1"})) #next scenarios - scenario B1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:ScenarioManager") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ScenarioManager") as xDialog: name = xDialog.getChild("name") name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) diff --git a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py index feef08e5022b..a7d1b762752a 100644 --- a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py +++ b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py @@ -18,7 +18,7 @@ class shareSpreadsheet(UITestCase): document = self.ui_test.get_component() #dialog shareSpreadsheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:ShareDocument", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ShareDocument", close_button="cancel") as xDialog: share = xDialog.getChild("share") share.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/calc_tests6/tdf104378.py b/sc/qa/uitest/calc_tests6/tdf104378.py index e228bbb9dd7e..a210306f3193 100644 --- a/sc/qa/uitest/calc_tests6/tdf104378.py +++ b/sc/qa/uitest/calc_tests6/tdf104378.py @@ -17,7 +17,7 @@ class tdf104378(UITestCase): enter_text_to_cell(gridwin, "A1", "遠程MySQL連接遠程MySQL連接遠程MySQL連接") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChineseConversion"): + with self.ui_test.execute_dialog_through_command(".uno:ChineseConversion"): pass document = self.ui_test.get_component() diff --git a/sc/qa/uitest/calc_tests6/tdf107267.py b/sc/qa/uitest/calc_tests6/tdf107267.py index 9e005abbed38..a15f1ac62d7a 100644 --- a/sc/qa/uitest/calc_tests6/tdf107267.py +++ b/sc/qa/uitest/calc_tests6/tdf107267.py @@ -23,7 +23,7 @@ class Subtotals(UITestCase): # 1. Open the test file gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:F123"})) # 2. Data->Subtotals - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") # = 1st group = 3. Group by "Person Number", select "shipping time" and use the Max function. diff --git a/sc/qa/uitest/calc_tests6/tdf116996.py b/sc/qa/uitest/calc_tests6/tdf116996.py index fc6fd625cb0c..9552b7ccc26a 100644 --- a/sc/qa/uitest/calc_tests6/tdf116996.py +++ b/sc/qa/uitest/calc_tests6/tdf116996.py @@ -16,7 +16,7 @@ class tdf116996(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xLOEntry = xPages.getChild('0') # Libreoffice xLOEntry.executeAction("EXPAND", tuple()) @@ -31,7 +31,7 @@ class tdf116996(UITestCase): pass #reopen options dialog and verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xLOEntry = xPages.getChild('0') # Libreoffice xLOEntry.executeAction("EXPAND", tuple()) diff --git a/sc/qa/uitest/calc_tests6/tdf118638.py b/sc/qa/uitest/calc_tests6/tdf118638.py index 1c499603f57c..69beea275128 100644 --- a/sc/qa/uitest/calc_tests6/tdf118638.py +++ b/sc/qa/uitest/calc_tests6/tdf118638.py @@ -22,7 +22,7 @@ class Subtotals(UITestCase): # Open the test file gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B15"})) #Data->Subtotals - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xGroupBy = xDialog.getChild("group_by") diff --git a/sc/qa/uitest/calc_tests6/tdf121263.py b/sc/qa/uitest/calc_tests6/tdf121263.py index 5bda02d27fac..1a3776f811d9 100644 --- a/sc/qa/uitest/calc_tests6/tdf121263.py +++ b/sc/qa/uitest/calc_tests6/tdf121263.py @@ -18,9 +18,9 @@ class tdf121263(UITestCase): document = self.ui_test.get_component() gridwin = xTopWindow.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "2"})) @@ -31,7 +31,7 @@ class tdf121263(UITestCase): self.xUITest.executeCommand(".uno:Hide") #show sheet Dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Show", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Show", close_button="cancel") as xDialog: treeview = xDialog.getChild("treeview") self.assertEqual(get_state_as_dict(treeview)["Children"], "2") diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py b/sc/qa/uitest/calc_tests6/tdf91726.py index a6071e0a4fae..4f64d9588202 100644 --- a/sc/qa/uitest/calc_tests6/tdf91726.py +++ b/sc/qa/uitest/calc_tests6/tdf91726.py @@ -18,7 +18,7 @@ class tdf91726(UITestCase): #select A1:E9 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:E9"})) #AutoFormat Styles - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoFormat", close_button="") as xDialog: #add new style "Default" xadd = xDialog.getChild("add") diff --git a/sc/qa/uitest/calc_tests7/tdf106667.py b/sc/qa/uitest/calc_tests7/tdf106667.py index 30727b42bf8e..16503995f121 100644 --- a/sc/qa/uitest/calc_tests7/tdf106667.py +++ b/sc/qa/uitest/calc_tests7/tdf106667.py @@ -25,7 +25,7 @@ class tdf106667(UITestCase): self.xUITest.executeCommand(".uno:SelectAll") - with self.ui_test.execute_dialog_through_command_guarded(".uno:About", close_button="btnClose") as xAboutDlg: + with self.ui_test.execute_dialog_through_command(".uno:About", close_button="btnClose") as xAboutDlg: pass self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "A") diff --git a/sc/qa/uitest/calc_tests7/tdf122509.py b/sc/qa/uitest/calc_tests7/tdf122509.py index 71deb3ee412a..dedace588808 100644 --- a/sc/qa/uitest/calc_tests7/tdf122509.py +++ b/sc/qa/uitest/calc_tests7/tdf122509.py @@ -21,7 +21,7 @@ class tdf122509(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category diff --git a/sc/qa/uitest/calc_tests7/tdf123122.py b/sc/qa/uitest/calc_tests7/tdf123122.py index 6e267d3f4d53..566ac527eef3 100644 --- a/sc/qa/uitest/calc_tests7/tdf123122.py +++ b/sc/qa/uitest/calc_tests7/tdf123122.py @@ -21,7 +21,7 @@ class tdf123122(UITestCase): #select cell A1 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category @@ -41,7 +41,7 @@ class tdf123122(UITestCase): #verify gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #format - cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #tab Numbers xliststore1 = xDialog.getChild("categorylb") #1st list / Category diff --git a/sc/qa/uitest/calc_tests7/tdf124896.py b/sc/qa/uitest/calc_tests7/tdf124896.py index 4d328d1391ce..cfed36c1da7f 100644 --- a/sc/qa/uitest/calc_tests7/tdf124896.py +++ b/sc/qa/uitest/calc_tests7/tdf124896.py @@ -16,7 +16,7 @@ class tdf124896(UITestCase): gridwin = xCalcDoc.getChild("grid_window") # Remove X Bar R Chart (2) sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Remove", close_button="yes") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Remove", close_button="yes") as xDialog: pass #verify; no crashes diff --git a/sc/qa/uitest/calc_tests8/navigator.py b/sc/qa/uitest/calc_tests8/navigator.py index de4059bbc5f9..86e473dae8d6 100644 --- a/sc/qa/uitest/calc_tests8/navigator.py +++ b/sc/qa/uitest/calc_tests8/navigator.py @@ -37,7 +37,7 @@ class navigator(UITestCase): self.assertEqual(len(xComments.getChildren()), 1) self.assertEqual(get_state_as_dict(xComments.getChild('0'))['Text'], 'Test Comment') - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog: xname_entry = xDialog.getChild("name_entry") xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT": "S1"})) diff --git a/sc/qa/uitest/calc_tests8/tdf114710.py b/sc/qa/uitest/calc_tests8/tdf114710.py index f12d1fae2493..e3d772bc8c8d 100644 --- a/sc/qa/uitest/calc_tests8/tdf114710.py +++ b/sc/qa/uitest/calc_tests8/tdf114710.py @@ -22,7 +22,7 @@ class tdf114710(UITestCase): self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: xList = xDialog.getChild('list') diff --git a/sc/qa/uitest/calc_tests8/tdf118308.py b/sc/qa/uitest/calc_tests8/tdf118308.py index a3d6f74111e5..4160d609e263 100644 --- a/sc/qa/uitest/calc_tests8/tdf118308.py +++ b/sc/qa/uitest/calc_tests8/tdf118308.py @@ -29,7 +29,7 @@ class tdf118308(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xDialog: # Without the fix in place, this test would have failed here # since a different dialog would have been opened and the children diff --git a/sc/qa/uitest/calc_tests8/tdf125051.py b/sc/qa/uitest/calc_tests8/tdf125051.py index 0f4eb92efbb9..992f3b0822e4 100644 --- a/sc/qa/uitest/calc_tests8/tdf125051.py +++ b/sc/qa/uitest/calc_tests8/tdf125051.py @@ -21,7 +21,7 @@ class tdf125051(UITestCase): document = self.ui_test.get_component() enter_text_to_cell(gridwin, "A1", "text") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:SpellDialog") as xDialog2: + with self.ui_test.execute_dialog_through_command(".uno:SpellDialog") as xDialog2: pass diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py b/sc/qa/uitest/calc_tests8/tdf126248.py index 1609a43cb2bf..773518c6e35b 100644 --- a/sc/qa/uitest/calc_tests8/tdf126248.py +++ b/sc/qa/uitest/calc_tests8/tdf126248.py @@ -31,7 +31,7 @@ class tdf126248(UITestCase): self.xUITest.executeCommand(".uno:Sidebar") def changeLocalSetting(self, language): - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog: xPages = xDialog.getChild("pages") xLanguageEntry = xPages.getChild('2') xLanguageEntry.executeAction("EXPAND", tuple()) @@ -53,7 +53,7 @@ class tdf126248(UITestCase): self.changeLocalSetting("Chinese (traditional)") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sc/qa/uitest/calc_tests8/tdf137726.py b/sc/qa/uitest/calc_tests8/tdf137726.py index 662d91da64a1..205f9e416854 100644 --- a/sc/qa/uitest/calc_tests8/tdf137726.py +++ b/sc/qa/uitest/calc_tests8/tdf137726.py @@ -14,7 +14,7 @@ class tdf137726(UITestCase): gridwin = xCalcDoc.getChild("grid_window") # three dialogs are displayed one after the other, click OK in all of them - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataDataPilotRun") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun") as xDialog: pass for i in range(2): diff --git a/sc/qa/uitest/calc_tests9/pivotTable.py b/sc/qa/uitest/calc_tests9/pivotTable.py index 402682378457..b7a4fd328b2a 100644 --- a/sc/qa/uitest/calc_tests9/pivotTable.py +++ b/sc/qa/uitest/calc_tests9/pivotTable.py @@ -25,7 +25,7 @@ class pivotTable(UITestCase): self.xUITest.executeCommand(".uno:GoUp") - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataDataPilotRun") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun") as xDialog: xFields = xDialog.getChild("listbox-fields") self.assertEqual(2, len(xFields.getChildren())) self.assertEqual("qtX", get_state_as_dict(xFields.getChild('0'))['Text']) diff --git a/sc/qa/uitest/calc_tests9/tdf121949.py b/sc/qa/uitest/calc_tests9/tdf121949.py index e3e8da9340a8..ec1876c4f148 100644 --- a/sc/qa/uitest/calc_tests9/tdf121949.py +++ b/sc/qa/uitest/calc_tests9/tdf121949.py @@ -19,7 +19,7 @@ class tdf121949 (UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B1", "EXTEND":"1"})) gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B3:B3", "EXTEND":"1"})) gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C3", "EXTEND":"1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Copy"): + with self.ui_test.execute_dialog_through_command(".uno:Copy"): pass self.ui_test.close_doc() diff --git a/sc/qa/uitest/calc_tests9/tdf126673.py b/sc/qa/uitest/calc_tests9/tdf126673.py index a837a4d900e9..a303949d0f1a 100644 --- a/sc/qa/uitest/calc_tests9/tdf126673.py +++ b/sc/qa/uitest/calc_tests9/tdf126673.py @@ -25,13 +25,13 @@ class tdf126673(UITestCase): #select A2 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"})) #optimal row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetOptimalRowHeight") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight") as xDialog: pass #select A2 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"})) #row height - with self.ui_test.execute_dialog_through_command_guarded(".uno:RowHeight", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RowHeight", close_button="cancel") as xDialog: xvalue = xDialog.getChild("value") heightStrOrig = get_state_as_dict(xvalue)["Text"] heightVal = heightStrOrig[:4] #default 0.45 cm, diff --git a/sc/qa/uitest/calc_tests9/tdf130371.py b/sc/qa/uitest/calc_tests9/tdf130371.py index c376da47e0d9..ce2b1d47ea77 100644 --- a/sc/qa/uitest/calc_tests9/tdf130371.py +++ b/sc/qa/uitest/calc_tests9/tdf130371.py @@ -20,7 +20,7 @@ class namedRanges(UITestCase): text2 = "value\t$Sheet3.$B$2\tSheet3" text3 = "value\t$Sheet4.$B$2\tSheet4" - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog: namesList = xDialog.getChild('names') self.assertEqual(2, len(namesList.getChildren())) self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1) @@ -35,7 +35,7 @@ class namedRanges(UITestCase): self.xUITest.executeCommand(".uno:Paste") - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog: namesList = xDialog.getChild('names') self.assertEqual(3, len(namesList.getChildren())) self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1) @@ -45,7 +45,7 @@ class namedRanges(UITestCase): self.xUITest.executeCommand(".uno:Undo") - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineName", close_button="cancel") as xDialog: namesList = xDialog.getChild('names') self.assertEqual(2, len(namesList.getChildren())) self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"], text1) diff --git a/sc/qa/uitest/calc_tests9/tdf133629.py b/sc/qa/uitest/calc_tests9/tdf133629.py index d2e0ee722bb2..67bead7fdec8 100644 --- a/sc/qa/uitest/calc_tests9/tdf133629.py +++ b/sc/qa/uitest/calc_tests9/tdf133629.py @@ -16,7 +16,7 @@ class tdf133629(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass self.xUITest.executeCommand(".uno:TableSelectAll") @@ -27,7 +27,7 @@ class tdf133629(UITestCase): self.assertIsNotNone(getattr(document.CurrentSelection, 'Sheet1.A1:AMJ1048576')) self.assertIsNotNone(getattr(document.CurrentSelection, 'Sheet1.A2:AMJ1048576')) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") diff --git a/sc/qa/uitest/calc_tests9/tdf137446.py b/sc/qa/uitest/calc_tests9/tdf137446.py index f62280401ecf..9ed6a0b36327 100644 --- a/sc/qa/uitest/calc_tests9/tdf137446.py +++ b/sc/qa/uitest/calc_tests9/tdf137446.py @@ -21,7 +21,7 @@ class tdf137446(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "lineObject"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog: self.assertEqual('10', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value']) @@ -34,7 +34,7 @@ class tdf137446(UITestCase): xDialog.getChild('MTR_FLD_WIDTH').executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:TransformDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog: self.assertEqual('10.1', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value']) diff --git a/sc/qa/uitest/calc_tests9/tdf141244.py b/sc/qa/uitest/calc_tests9/tdf141244.py index 187891cb2b0c..ea8a467c4b66 100644 --- a/sc/qa/uitest/calc_tests9/tdf141244.py +++ b/sc/qa/uitest/calc_tests9/tdf141244.py @@ -20,7 +20,7 @@ class tdf141244(UITestCase): enter_text_to_cell(gridwin, "A1", '=DDE("soffice";"data1.ods";"sheet1.A1")') - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditLinks", close_button="close") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditLinks", close_button="close") as xDialog: xLinks = xDialog.getChild("TB_LINKS") self.assertEqual(1, len(xLinks.getChildren())) diff --git a/sc/qa/uitest/chart/copyPaste.py b/sc/qa/uitest/chart/copyPaste.py index bef17145690a..e2d8fe0349e2 100644 --- a/sc/qa/uitest/chart/copyPaste.py +++ b/sc/qa/uitest/chart/copyPaste.py @@ -39,7 +39,7 @@ class CopyPaste(UITestCase): with self.ui_test.load_empty_file("calc") as calc_document: # Rename the sheet to match the same name as the first document - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog: xname_entry = xDialog.getChild("name_entry") xname_entry.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) diff --git a/sc/qa/uitest/chart/create_chart.py b/sc/qa/uitest/chart/create_chart.py index 42f8211a8e83..878af422a581 100644 --- a/sc/qa/uitest/chart/create_chart.py +++ b/sc/qa/uitest/chart/create_chart.py @@ -34,7 +34,7 @@ class CalcChartUIDemo(UITestCase): self.fill_spreadsheet() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel"): pass self.ui_test.close_doc() @@ -45,7 +45,7 @@ class CalcChartUIDemo(UITestCase): self.fill_spreadsheet() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass self.ui_test.close_doc() @@ -56,7 +56,7 @@ class CalcChartUIDemo(UITestCase): self.fill_spreadsheet() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg: xNextBtn = xChartDlg.getChild("next") xNextBtn.executeAction("CLICK", tuple()) @@ -76,7 +76,7 @@ class CalcChartUIDemo(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() xGridWindow = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""})) @@ -94,7 +94,7 @@ class CalcChartUIDemo(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() xGridWindow = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""})) @@ -115,7 +115,7 @@ class CalcChartUIDemo(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() xGridWindow = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""})) diff --git a/sc/qa/uitest/chart/edit_chart.py b/sc/qa/uitest/chart/edit_chart.py index 4c9bb50c25ea..48d9149004f5 100644 --- a/sc/qa/uitest/chart/edit_chart.py +++ b/sc/qa/uitest/chart/edit_chart.py @@ -36,7 +36,7 @@ class CalcChartEditUIDemo(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() xGridWindow = xCalcDoc.getChild("grid_window") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""})) diff --git a/sc/qa/uitest/chart/tdf101894.py b/sc/qa/uitest/chart/tdf101894.py index 66dcf1fbc483..9737d41046e1 100644 --- a/sc/qa/uitest/chart/tdf101894.py +++ b/sc/qa/uitest/chart/tdf101894.py @@ -34,7 +34,7 @@ class tdf101894(UITestCase): xOldSheetRanges.append(xRow) # Rename the sheet first - with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog: xname_entry = xDialog.getChild("name_entry") oldName = get_state_as_dict(xname_entry)['Text'] @@ -43,7 +43,7 @@ class tdf101894(UITestCase): xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"})) # Copy sheet and use the old name - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog: newName = xDialog.getChild("newName") newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) diff --git a/sc/qa/uitest/chart/tdf124295.py b/sc/qa/uitest/chart/tdf124295.py index f4f75e42c6f3..131f897c9573 100644 --- a/sc/qa/uitest/chart/tdf124295.py +++ b/sc/qa/uitest/chart/tdf124295.py @@ -16,7 +16,7 @@ class tdf124295(UITestCase): def test_tdf124295(self): # Open spreadsheet and insert chart self.ui_test.create_doc_in_start_center("calc") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel") as xChartDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel") as xChartDlg: # Click 3D look check button x3DCheckBtn = xChartDlg.getChild("3dlook") diff --git a/sc/qa/uitest/chart/tdf131715.py b/sc/qa/uitest/chart/tdf131715.py index 11c4ae42fd2c..d8954d9cfab6 100644 --- a/sc/qa/uitest/chart/tdf131715.py +++ b/sc/qa/uitest/chart/tdf131715.py @@ -11,7 +11,7 @@ class tdf131715(UITestCase): def test_tdf131715(self): self.ui_test.create_doc_in_start_center("calc") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg: xWizard = xChartDlg.getChild('Wizard') diff --git a/sc/qa/uitest/chart/tdf43175.py b/sc/qa/uitest/chart/tdf43175.py index cc3b24e8b778..08ad67b2211d 100644 --- a/sc/qa/uitest/chart/tdf43175.py +++ b/sc/qa/uitest/chart/tdf43175.py @@ -15,7 +15,7 @@ class Tdf43175(UITestCase): self.xUITest.executeCommand(".uno:TableSelectAll") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog: insertBefore = xDialog.getChild("insertBefore") # Select - move to end position - diff --git a/sc/qa/uitest/chart/tdf46885.py b/sc/qa/uitest/chart/tdf46885.py index 6f95ab9636bb..637033505fd3 100644 --- a/sc/qa/uitest/chart/tdf46885.py +++ b/sc/qa/uitest/chart/tdf46885.py @@ -21,7 +21,7 @@ class tdf46885(UITestCase): document = self.ui_test.get_component() enter_text_to_cell(gridwin, "A10", "col1") #When you start a new chart and have one empty cell selected LibO will crash when you select the Next>> button. - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg: xNextBtn = xChartDlg.getChild("next") xNextBtn.executeAction("CLICK", tuple()) @@ -38,7 +38,7 @@ class tdf46885(UITestCase): enter_text_to_cell(gridwin, "A10", "col1") #If you select multiple empty cells and then start a new chart LibO will crash immediately. gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C4"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg: xNextBtn = xChartDlg.getChild("next") xNextBtn.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/chart/tdf62349.py b/sc/qa/uitest/chart/tdf62349.py index cf5d231bbba5..8cc3e6b9c741 100644 --- a/sc/qa/uitest/chart/tdf62349.py +++ b/sc/qa/uitest/chart/tdf62349.py @@ -21,7 +21,7 @@ class tdf62349(UITestCase): #3: select all data cells C5:H9 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C5:H9"})) # 4: create a chart with insert/chart menu - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): pass # 5: (single) click to an empty cell to finalize the chart diff --git a/sc/qa/uitest/chart/tdf99069.py b/sc/qa/uitest/chart/tdf99069.py index c6eec4d035e7..67d1ca86f845 100644 --- a/sc/qa/uitest/chart/tdf99069.py +++ b/sc/qa/uitest/chart/tdf99069.py @@ -20,7 +20,7 @@ class tdf99069(UITestCase): gridwin = xCalcDoc.getChild("grid_window") #(1) Download and open example.ods attached to tdf#97266 with cell B1 active. #(2) In tool bar, click the chart icon. Program presents Chart Wizard. - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"): + with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"): # the chart shows a border with handles on each side and at each corner. pass diff --git a/sc/qa/uitest/conditional_format/tdf100793.py b/sc/qa/uitest/conditional_format/tdf100793.py index 15da954df0ba..26e0c6c201a5 100644 --- a/sc/qa/uitest/conditional_format/tdf100793.py +++ b/sc/qa/uitest/conditional_format/tdf100793.py @@ -25,7 +25,7 @@ class tdf100793(UITestCase): #2) Go to sheet "plan" gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "2"})) #3) Open the conditional formatting management dialog-> The indicated range should be G18:K29,F18,F20:F29 - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: # check that we have exactly one conditional formats in the beginning xList = xCondFormatMgr.getChild("CONTAINER") @@ -72,7 +72,7 @@ class tdf100793(UITestCase): self.ui_test.close_dialog_through_button(xOKBtn) #verify - reopen, check range - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: xEditBtn = xCondFormatMgr.getChild("edit") with self.ui_test.execute_dialog_through_action(xEditBtn, "CLICK", event_name = "ModelessDialogVisible") as xCondFormatDlg: xedassign = xCondFormatDlg.getChild("edassign") diff --git a/sc/qa/uitest/conditional_format/tdf104026.py b/sc/qa/uitest/conditional_format/tdf104026.py index 3f8195f60dc4..f699c9b640dc 100644 --- a/sc/qa/uitest/conditional_format/tdf104026.py +++ b/sc/qa/uitest/conditional_format/tdf104026.py @@ -12,7 +12,7 @@ class Tdf104026(UITestCase): def execute_conditional_format_manager_dialog(self, nCount): - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr: aExpectedResults = ['A2\tCell value != $Sheet1.$B2', 'A3\tCell value != $Sheet1.$B3', 'A4\tCell value != $Sheet1.$B4', 'A5\tCell value != $Sheet1.$B5', diff --git a/sc/qa/uitest/conditional_format/tdf105544.py b/sc/qa/uitest/conditional_format/tdf105544.py index e0c58b55e373..90bcda427cb0 100644 --- a/sc/qa/uitest/conditional_format/tdf105544.py +++ b/sc/qa/uitest/conditional_format/tdf105544.py @@ -20,7 +20,7 @@ class tdf105544(UITestCase): gridwin = xCalcDoc.getChild("grid_window") #2. select B3. Format> conditional formatting> manage gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: # check that we have exactly four conditional formats in the beginning xList = xCondFormatMgr.getChild("CONTAINER") diff --git a/sc/qa/uitest/conditional_format/tdf117899.py b/sc/qa/uitest/conditional_format/tdf117899.py index 12bbb5cce5b4..20c3a71e5264 100644 --- a/sc/qa/uitest/conditional_format/tdf117899.py +++ b/sc/qa/uitest/conditional_format/tdf117899.py @@ -16,7 +16,7 @@ class Tdf117899(UITestCase): def execute_conditional_format_manager_dialog(self): - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog") as xCondFormatMgr: aExpectedResult = 'Formula is $E3="нет"' xList = xCondFormatMgr.getChild("CONTAINER") @@ -45,7 +45,7 @@ class Tdf117899(UITestCase): self.xUITest.executeCommandWithParameters(".uno:ClipboardFormatItems", formatProperty) # Save Copy as - with self.ui_test.execute_dialog_through_command_guarded(".uno:ObjectMenue?VerbID:short=-8", close_button="open") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ObjectMenue?VerbID:short=-8", close_button="open") as xDialog: xFileName = xDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) diff --git a/sc/qa/uitest/conditional_format/tdf81696.py b/sc/qa/uitest/conditional_format/tdf81696.py index 18c3d32f3ac8..235310df6c49 100644 --- a/sc/qa/uitest/conditional_format/tdf81696.py +++ b/sc/qa/uitest/conditional_format/tdf81696.py @@ -24,7 +24,7 @@ class tdf81696(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"})) #Open sort dialog by DATA - SORT,Just sort it by Column A, ascending. (it's default) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") xleftright = xDialog.getChild("leftright") select_pos(xTabs, "0") diff --git a/sc/qa/uitest/conditional_format/tdf96453.py b/sc/qa/uitest/conditional_format/tdf96453.py index 39b6b6eabb50..26aa40b8c233 100644 --- a/sc/qa/uitest/conditional_format/tdf96453.py +++ b/sc/qa/uitest/conditional_format/tdf96453.py @@ -20,7 +20,7 @@ class ConditionalFormatDlgTest(UITestCase): conditional_format_list = get_conditional_format_from_sheet(sheet) self.assertEqual(conditional_format_list.getLength(), 2) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: + with self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog", close_button="") as xCondFormatMgr: # check that we have exactly two conditional formats in the beginning diff --git a/sc/qa/uitest/csv_dialog/tdf142395.py b/sc/qa/uitest/csv_dialog/tdf142395.py index 412ce6e6f53a..a667a886ca8d 100644 --- a/sc/qa/uitest/csv_dialog/tdf142395.py +++ b/sc/qa/uitest/csv_dialog/tdf142395.py @@ -14,7 +14,7 @@ class Tdf142395(UITestCase): def test_tdf142395(self): # Load file from Open dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf142395.csv")})) diff --git a/sc/qa/uitest/csv_dialog/tdf57841.py b/sc/qa/uitest/csv_dialog/tdf57841.py index 9deda7611aa7..87c2a2b1b9f5 100644 --- a/sc/qa/uitest/csv_dialog/tdf57841.py +++ b/sc/qa/uitest/csv_dialog/tdf57841.py @@ -14,7 +14,7 @@ class Tdf57841(UITestCase): def test_tdf57841(self): # Load file from Open dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf57841.csv")})) diff --git a/sc/qa/uitest/csv_dialog/tdf60468.py b/sc/qa/uitest/csv_dialog/tdf60468.py index 36baa64082fa..bb4603de56b4 100644 --- a/sc/qa/uitest/csv_dialog/tdf60468.py +++ b/sc/qa/uitest/csv_dialog/tdf60468.py @@ -14,7 +14,7 @@ class Tdf60468(UITestCase): def test_tdf60468(self): # Load file from Open dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:Open", close_button="open") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:Open", close_button="open") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf60468.csv")})) diff --git a/sc/qa/uitest/key_f4/f4.py b/sc/qa/uitest/key_f4/f4.py index a6da13d8afc9..e1be28dcda77 100644 --- a/sc/qa/uitest/key_f4/f4.py +++ b/sc/qa/uitest/key_f4/f4.py @@ -84,7 +84,7 @@ class keyF4(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #* Tools --> Options --> Calc --> Formula --> Syntax = Excel R1C1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') # Calc @@ -113,7 +113,7 @@ class keyF4(UITestCase): self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "=R3C3") #Give it back Tools --> Options --> Calc --> Formula --> Syntax = Calc A1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') # Calc diff --git a/sc/qa/uitest/manual_tests/calc.py b/sc/qa/uitest/manual_tests/calc.py index 6e05f5b97de9..92c33e0d1803 100644 --- a/sc/qa/uitest/manual_tests/calc.py +++ b/sc/qa/uitest/manual_tests/calc.py @@ -37,7 +37,7 @@ class ManualCalcTests(UITestCase): xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) # Execute "Select DB Range dialog" - with self.ui_test.execute_dialog_through_command_guarded(".uno:SelectDB") as xSelectNameDlg: + with self.ui_test.execute_dialog_through_command(".uno:SelectDB") as xSelectNameDlg: xListBox = xSelectNameDlg.getChild("treeview") xListBoxState = get_state_as_dict(xListBox) @@ -70,7 +70,7 @@ class ManualCalcTests(UITestCase): xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B10"})) # Execute "Sort" dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort"): + with self.ui_test.execute_dialog_through_command(".uno:DataSort"): pass document = self.ui_test.get_component() @@ -95,7 +95,7 @@ class ManualCalcTests(UITestCase): xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xValidationDlg: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xValidationDlg: xAllowList = xValidationDlg.getChild("allow") xAllowList.executeAction("SELECT", mkPropertyValues({"POS": "1"})) @@ -135,7 +135,7 @@ class ManualCalcTests(UITestCase): xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xPasteSpecialDlg: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: xAllChkBox = xPasteSpecialDlg.getChild("paste_all") xAllChkBox.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/manual_tests/more_calc.py b/sc/qa/uitest/manual_tests/more_calc.py index e99015a92f2e..9212c2606e0e 100644 --- a/sc/qa/uitest/manual_tests/more_calc.py +++ b/sc/qa/uitest/manual_tests/more_calc.py @@ -35,7 +35,7 @@ class ManualCalcTests(UITestCase): xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) # Choose Paste Special Options and paste data - with self.ui_test.execute_dialog_through_command_guarded(".uno:PasteSpecial") as xPasteSpecialDlg: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: xAllChkBox = xPasteSpecialDlg.getChild("paste_all") xAllChkBox.executeAction("CLICK", tuple()) xLinkChkBox = xPasteSpecialDlg.getChild("link") diff --git a/sc/qa/uitest/options/tdf122977.py b/sc/qa/uitest/options/tdf122977.py index 342faf23df50..1ca0c1465dde 100644 --- a/sc/qa/uitest/options/tdf122977.py +++ b/sc/qa/uitest/options/tdf122977.py @@ -21,7 +21,7 @@ class chartDefaultColors(UITestCase): document = self.ui_test.get_component() #Go to Tools -> Options -> Charts -> Default Colors - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog", close_button="cancel") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xChartEntry = xPages.getChild('5') # Charts diff --git a/sc/qa/uitest/pageFormat/tdf123508.py b/sc/qa/uitest/pageFormat/tdf123508.py index 5b74955c6072..9fe086341fe4 100644 --- a/sc/qa/uitest/pageFormat/tdf123508.py +++ b/sc/qa/uitest/pageFormat/tdf123508.py @@ -20,7 +20,7 @@ class tdf123508(UITestCase): xCalcDoc = self.xUITest.getTopFocusWindow() gridwin = xCalcDoc.getChild("grid_window") #open "Format > Page - Sheet > Scale - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageFormatDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageFormatDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Scale scalingMode = xDialog.getChild("comboLB_SCALEMODE") @@ -34,7 +34,7 @@ class tdf123508(UITestCase): #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageFormatDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageFormatDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") #tab Scale scalingMode = xDialog.getChild("comboLB_SCALEMODE") 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"})) diff --git a/sc/qa/uitest/range_name/create_range_name.py b/sc/qa/uitest/range_name/create_range_name.py index 0118aba85191..98cba79d88c2 100644 --- a/sc/qa/uitest/range_name/create_range_name.py +++ b/sc/qa/uitest/range_name/create_range_name.py @@ -67,7 +67,7 @@ class CreateRangeNameTest(UITestCase): self.assertEqual(3.0, get_cell_by_position(document, 0, 0, 1).getValue()) # Change the name - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog: xNamesList = xDialog.getChild('names') self.assertEqual(1, len(xNamesList.getChildren())) @@ -120,7 +120,7 @@ class CreateRangeNameTest(UITestCase): # Use the name range in the current sheet gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertName", close_button="paste") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertName", close_button="paste") as xDialog: xCtrl = xDialog.getChild('ctrl') self.assertEqual(1, len(xCtrl.getChildren())) @@ -135,13 +135,13 @@ class CreateRangeNameTest(UITestCase): self.assertEqual("=localRangeName", get_cell_by_position(document, 0, 1, 0).getFormula()) # Insert a new sheet - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert"): + with self.ui_test.execute_dialog_through_command(".uno:Insert"): pass # Use the name range in the new sheet gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertName", close_button="paste") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertName", close_button="paste") as xDialog: xCtrl = xDialog.getChild('ctrl') self.assertEqual(1, len(xCtrl.getChildren())) @@ -158,7 +158,7 @@ class CreateRangeNameTest(UITestCase): # and AssertionError: '=Sheet1.localRangeName' != '=localrangename' self.assertEqual("=Sheet1.localRangeName", get_cell_by_position(document, 0, 1, 0).getFormula()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DefineName") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog: # tdf#138851: Without the fix in place, this test would have failed with # AssertionError: 'Sheet1' != 'Document (Global)' diff --git a/sc/qa/uitest/range_name/tdf137617.py b/sc/qa/uitest/range_name/tdf137617.py index c0a84ba8cb03..44410bff6de3 100644 --- a/sc/qa/uitest/range_name/tdf137617.py +++ b/sc/qa/uitest/range_name/tdf137617.py @@ -25,7 +25,7 @@ class tdf137617(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:CreateNames") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog: # Only left is selected @@ -45,7 +45,7 @@ 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_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') @@ -62,7 +62,7 @@ class tdf137617(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:D2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:CreateNames") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:CreateNames") as xDialog: # Only top is selected @@ -83,7 +83,7 @@ class tdf137617(UITestCase): self.assertEqual('Result4', get_state_as_dict(xPosWindow)['Text']) # Change formula syntax back to "Calc A1" - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') diff --git a/sc/qa/uitest/search_replace/tdf39917.py b/sc/qa/uitest/search_replace/tdf39917.py index 1f2445b5148b..3431b102af1b 100644 --- a/sc/qa/uitest/search_replace/tdf39917.py +++ b/sc/qa/uitest/search_replace/tdf39917.py @@ -23,7 +23,7 @@ class tdf39917(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() #* Tools --> Options --> Calc --> Formula --> Syntax = Excel R1C1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') # Calc @@ -40,14 +40,14 @@ class tdf39917(UITestCase): # 2. Tools -> Options -> LibreOffice Calc -> Formula: Set syntax to Excel A1 # 5. Fill fields: - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Insert") as xDialog: after = xDialog.getChild("after") after.executeAction("CLICK", tuple()) nameed = xDialog.getChild("nameed") nameed.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) nameed.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) nameed.executeAction("TYPE", mkPropertyValues({"TEXT":"Page2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Insert") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Insert") as xDialog: after = xDialog.getChild("after") after.executeAction("CLICK", tuple()) nameed = xDialog.getChild("nameed") @@ -79,7 +79,7 @@ class tdf39917(UITestCase): enter_text_to_cell(gridwin, "A1", "=FORMULA(R[3]C[1])") self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "=Page3!RC") #Give it back Tools --> Options --> Calc --> Formula --> Syntax = Calc A1 - with self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") as xDialogOpt: + with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt: xPages = xDialogOpt.getChild("pages") xCalcEntry = xPages.getChild('3') # Calc diff --git a/sc/qa/uitest/signatureLine/insertSignatureLine.py b/sc/qa/uitest/signatureLine/insertSignatureLine.py index a668227e25da..7032858ef1c6 100644 --- a/sc/qa/uitest/signatureLine/insertSignatureLine.py +++ b/sc/qa/uitest/signatureLine/insertSignatureLine.py @@ -21,7 +21,7 @@ class insertSignatureLineCalc(UITestCase): document = self.ui_test.get_component() # cancel the dialog without doing anything - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine", close_button="cancel") as xDialog: xName = xDialog.getChild("edit_name") xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line @@ -30,7 +30,7 @@ class insertSignatureLineCalc(UITestCase): document.Sheets.getByIndex(0).DrawPage.getByIndex(0) # set the signature line - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog: xName = xDialog.getChild("edit_name") xTitle = xDialog.getChild("edit_title") @@ -61,7 +61,7 @@ class insertSignatureLineCalc(UITestCase): gridwin = xCalcDoc.getChild("grid_window") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSignatureLine") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog: xName = xDialog.getChild("edit_name") xTitle = xDialog.getChild("edit_title") diff --git a/sc/qa/uitest/sort/naturalSort.py b/sc/qa/uitest/sort/naturalSort.py index d48755ac1cc0..373fd8bbe3c0 100644 --- a/sc/qa/uitest/sort/naturalSort.py +++ b/sc/qa/uitest/sort/naturalSort.py @@ -29,7 +29,7 @@ class CalcNaturalSorting(UITestCase): enter_text_to_cell(gridwin, "A4", "MW180SSMOU456.994JIL4") enter_text_to_cell(gridwin, "A5", "MW101SSMOU456.996JIL4") #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xNatural = xDialog.getChild("naturalsort") @@ -57,7 +57,7 @@ class CalcNaturalSorting(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "D1:D4"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") @@ -85,7 +85,7 @@ class CalcNaturalSorting(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:D1"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") xleftright = xDialog.getChild("leftright") select_pos(xTabs, "1") diff --git a/sc/qa/uitest/sort/sorting.py b/sc/qa/uitest/sort/sorting.py index 5529dbb7301d..2c2c56fc2bf7 100644 --- a/sc/qa/uitest/sort/sorting.py +++ b/sc/qa/uitest/sort/sorting.py @@ -54,7 +54,7 @@ class CalcSorting(UITestCase): #Select cell A3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) #Open sort dialog by DATA - SORT /Switch to tabpage Options - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #Verify that option "Range contains column labels" is set @@ -98,7 +98,7 @@ class CalcSorting(UITestCase): #Select cell B3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"})) #Open sort dialog by DATA - SORT /Switch to tabpage Options - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #Verify that option "Range contains column labels" is not set @@ -230,7 +230,7 @@ class CalcSorting(UITestCase): #Select cell A3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #Verify that the first sort criteria is set to "Number(ascending)" @@ -242,7 +242,7 @@ class CalcSorting(UITestCase): #Select cell B3 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #Verify that the first sort criteria is set to "Misc (ascending)" @@ -257,7 +257,7 @@ class CalcSorting(UITestCase): gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #Verify that the first sort criteria is set to "Number(ascending)" @@ -271,7 +271,7 @@ class CalcSorting(UITestCase): #Move the active cell inside the range to column B by using the TAB key gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") #Verify that the first sort criteria is set to "Misc (ascending)" diff --git a/sc/qa/uitest/sort/subtotals.py b/sc/qa/uitest/sort/subtotals.py index 63dd2675eacb..b48079a02ec8 100644 --- a/sc/qa/uitest/sort/subtotals.py +++ b/sc/qa/uitest/sort/subtotals.py @@ -32,14 +32,14 @@ class Subtotals(UITestCase): enter_text_to_cell(gridwin, "A8", "1") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A9"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals"): + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals"): pass self.assertEqual(get_cell_by_position(document, 0, 0, 7).getValue(), 1) self.assertEqual(get_cell_by_position(document, 0, 0, 8).getString(), "") # check cancel button - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals", close_button="cancel"): pass self.ui_test.close_doc() @@ -54,7 +54,7 @@ class Subtotals(UITestCase): # Select from the menu bar Data # Select option subtotal # Subtotal dialog displays - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: # Select group by: Category xGroupBy = xDialog.getChild("group_by") select_by_text(xGroupBy, "Category") @@ -76,11 +76,11 @@ class Subtotals(UITestCase): # 1 select all cells self.xUITest.executeCommand(".uno:SelectAll")#use uno command Menu Edit->Select All # 2 invoke sub-total menu and select none - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: xGroupBy = xDialog.getChild("group_by") select_by_text(xGroupBy, "- none -") # 2 invoke sort menu and... crash - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:DataSort", close_button="cancel"): pass self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 8).getString(), "z") @@ -92,7 +92,7 @@ class Subtotals(UITestCase): gridwin = XcalcDoc.getChild("grid_window") # 1. Open the test file # 2. Data->Subtotals - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: # 3. Group by->Trans date xGroupBy = xDialog.getChild("group_by") select_by_text(xGroupBy, "Trans Date") @@ -103,7 +103,7 @@ class Subtotals(UITestCase): xFirstEntry.executeAction("CLICK", tuple()) # 5. Click OK # 6. Data->Subtotals - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: # 7. Group by->-none- xGroupBy = xDialog.getChild("group_by") select_by_text(xGroupBy, "- none -") @@ -114,7 +114,7 @@ class Subtotals(UITestCase): xFirstEntry.executeAction("CLICK", tuple()) # 9. Click OK # 10. Data->Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: # 11. Sort key 1->Post Date. sortkey1 = xDialog.getChild("sortlb") select_by_text(sortkey1, "Post Date") @@ -132,7 +132,7 @@ class Subtotals(UITestCase): # 2. Place cursor in cell outside of subtotals range (e.g. B7) gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B7"})) # 3. Data → Subtotals - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSubTotals") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSubTotals") as xDialog: # 4. Group by: "- none -" xGroupBy = xDialog.getChild("group_by") select_by_text(xGroupBy, "- none -") diff --git a/sc/qa/uitest/sort/tdf100517.py b/sc/qa/uitest/sort/tdf100517.py index b02f5a7a641f..350d233f12f6 100644 --- a/sc/qa/uitest/sort/tdf100517.py +++ b/sc/qa/uitest/sort/tdf100517.py @@ -16,7 +16,7 @@ class tdf100517(UITestCase): def execute_sort_dialog(self, gridwin, bIncludeNotes): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sc/qa/uitest/sort/tdf105301.py b/sc/qa/uitest/sort/tdf105301.py index 7e9aa32f4803..c7747c680917 100644 --- a/sc/qa/uitest/sort/tdf105301.py +++ b/sc/qa/uitest/sort/tdf105301.py @@ -18,7 +18,7 @@ class tdf105301(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:R9"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") self.assertEqual("Column B", get_state_as_dict(xDialog.getChild("sortlb"))['DisplayText']) diff --git a/sc/qa/uitest/sort/tdf126678.py b/sc/qa/uitest/sort/tdf126678.py index f6a13f2895bf..1a12a8b2bc7f 100644 --- a/sc/qa/uitest/sort/tdf126678.py +++ b/sc/qa/uitest/sort/tdf126678.py @@ -16,7 +16,7 @@ class tdf126678(UITestCase): def execute_sort_dialog(self, gridwin, bIncludeFormats): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sc/qa/uitest/sort/tdf49531.py b/sc/qa/uitest/sort/tdf49531.py index 6dd77e6c7e13..1a919d5f4e3d 100644 --- a/sc/qa/uitest/sort/tdf49531.py +++ b/sc/qa/uitest/sort/tdf49531.py @@ -25,7 +25,7 @@ class tdf49531(UITestCase): #Menu 'Data -> Sort -> Top to bottom - all otheroptions unchecked #Column B - Ascending' <ok> - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") diff --git a/sc/qa/uitest/sort/tdf53482.py b/sc/qa/uitest/sort/tdf53482.py index 01671558754a..b54196e89997 100644 --- a/sc/qa/uitest/sort/tdf53482.py +++ b/sc/qa/uitest/sort/tdf53482.py @@ -23,7 +23,7 @@ class tdf53482(UITestCase): #1. Highlight cells to be sorted A8:J124 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A8:J124"})) #2. Click Data menu, Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #3. On Options tab, tick 'Range contains column labels' @@ -57,7 +57,7 @@ class tdf53482(UITestCase): #1. Highlight cells to be sorted gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A5"})) #2. Click Data menu, Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #3. On Options tab, tick 'Range contains column labels' diff --git a/sc/qa/uitest/sort/tdf54018.py b/sc/qa/uitest/sort/tdf54018.py index 62cea8d2e961..396fe5a74ddd 100644 --- a/sc/qa/uitest/sort/tdf54018.py +++ b/sc/qa/uitest/sort/tdf54018.py @@ -23,7 +23,7 @@ class tdf54018(UITestCase): #click top left columns / rows heading field to select all cells self.xUITest.executeCommand(".uno:SelectAll") #Menu 'Data -> Sort -> Column D -> Descending' <ok> - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xSortKey1 = xDialog.getChild("sortlb") diff --git a/sc/qa/uitest/sort/tdf57465.py b/sc/qa/uitest/sort/tdf57465.py index 8f40df5d704b..4028b18bda55 100644 --- a/sc/qa/uitest/sort/tdf57465.py +++ b/sc/qa/uitest/sort/tdf57465.py @@ -19,7 +19,7 @@ class tdf57465(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:G4"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sc/qa/uitest/sort/tdf91305.py b/sc/qa/uitest/sort/tdf91305.py index e3699c05de6a..481d429c2531 100644 --- a/sc/qa/uitest/sort/tdf91305.py +++ b/sc/qa/uitest/sort/tdf91305.py @@ -52,7 +52,7 @@ class tdf91305(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C1"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") xleftright = xDialog.getChild("leftright") select_pos(xTabs, "1") @@ -62,7 +62,7 @@ class tdf91305(UITestCase): self.assertEqual(get_cell_by_position(document, 0, 1, 0).getString(), "cc") self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(), "ff") #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") xleftright = xDialog.getChild("leftright") xdown = xDialog.getChild("down") diff --git a/sc/qa/uitest/sort/tdf95192.py b/sc/qa/uitest/sort/tdf95192.py index 35dfd44f4183..71af9e2a5d63 100644 --- a/sc/qa/uitest/sort/tdf95192.py +++ b/sc/qa/uitest/sort/tdf95192.py @@ -21,7 +21,7 @@ class tdf95192(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") diff --git a/sc/qa/uitest/sort/tdf99208.py b/sc/qa/uitest/sort/tdf99208.py index 28cce8bb7a54..c754e00dc187 100644 --- a/sc/qa/uitest/sort/tdf99208.py +++ b/sc/qa/uitest/sort/tdf99208.py @@ -24,7 +24,7 @@ class tdf99208(UITestCase): #Menu 'Data -> Sort #Column A - Ascending' <ok> - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") diff --git a/sc/qa/uitest/sort/tdf99627.py b/sc/qa/uitest/sort/tdf99627.py index 5f40a2d00b99..f0509210cac8 100644 --- a/sc/qa/uitest/sort/tdf99627.py +++ b/sc/qa/uitest/sort/tdf99627.py @@ -22,7 +22,7 @@ class tdf99627(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") diff --git a/sc/qa/uitest/sort/tdf99773.py b/sc/qa/uitest/sort/tdf99773.py index 9647278a1f5b..0d5f61a308ac 100644 --- a/sc/qa/uitest/sort/tdf99773.py +++ b/sc/qa/uitest/sort/tdf99773.py @@ -31,7 +31,7 @@ class tdf99773(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A6"})) #Open sort dialog by DATA - SORT - with self.ui_test.execute_dialog_through_command_guarded(".uno:DataSort") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:DataSort") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xNatural = xDialog.getChild("naturalsort") diff --git a/sc/qa/uitest/validity/tdf137945.py b/sc/qa/uitest/validity/tdf137945.py index 349bff23577e..41d491728bb2 100644 --- a/sc/qa/uitest/validity/tdf137945.py +++ b/sc/qa/uitest/validity/tdf137945.py @@ -13,7 +13,7 @@ class Tdf137945(UITestCase): def test_tdf137945(self): with self.ui_test.load_file(get_url_for_data_file("tdf137945.ods")) as calc_doc: - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xInput = xDialog.getChild("inputhelp") diff --git a/sc/qa/uitest/validity/tdf138134.py b/sc/qa/uitest/validity/tdf138134.py index f104fc3bfc84..c39529b78154 100644 --- a/sc/qa/uitest/validity/tdf138134.py +++ b/sc/qa/uitest/validity/tdf138134.py @@ -26,7 +26,7 @@ class DetectiveCircle(UITestCase): #Select the cells to be validated gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) #Apply Data > Validity ... > Whole Numbers - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") diff --git a/sc/qa/uitest/validity/tdf53920.py b/sc/qa/uitest/validity/tdf53920.py index ca651eb0cfbb..82687900c3b0 100644 --- a/sc/qa/uitest/validity/tdf53920.py +++ b/sc/qa/uitest/validity/tdf53920.py @@ -29,7 +29,7 @@ class tdf53920(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3", "EXTEND":"1"})) gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5", "EXTEND":"1"})) #Apply Data > Validity ... > Cell Range - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -40,21 +40,21 @@ class tdf53920(UITestCase): #Expected behavior: All selected cells validate data. gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xmin = xDialog.getChild("min") self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range") self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xmin = xDialog.getChild("min") self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range") self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3") gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xmin = xDialog.getChild("min") self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell range") diff --git a/sc/qa/uitest/validity/tdf65686.py b/sc/qa/uitest/validity/tdf65686.py index 83d691026968..04e0955c352c 100644 --- a/sc/qa/uitest/validity/tdf65686.py +++ b/sc/qa/uitest/validity/tdf65686.py @@ -23,7 +23,7 @@ class tdf65686(UITestCase): #- Select Allow List #- Enter Entries Aap Noot Mies #- OK - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -38,7 +38,7 @@ class tdf65686(UITestCase): minlist.executeAction("TYPE", mkPropertyValues({"TEXT":"Mies"})) #- again open Data > Validity #> there are empty lines in the list Entries - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") minlist = xDialog.getChild("minlist") diff --git a/sc/qa/uitest/validity/tdf96698.py b/sc/qa/uitest/validity/tdf96698.py index 007967410e49..fcea7464ea96 100644 --- a/sc/qa/uitest/validity/tdf96698.py +++ b/sc/qa/uitest/validity/tdf96698.py @@ -22,7 +22,7 @@ class tdf96698(UITestCase): #A general validity check for the entered new content of the active cell - especially for text #with a custom formula like in Excel is not possible. gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -32,7 +32,7 @@ class tdf96698(UITestCase): select_by_text(xallow, "Custom") xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"ISERROR(FIND(\",\",B2))"})) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") xmin = xDialog.getChild("min") @@ -42,7 +42,7 @@ class tdf96698(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -52,7 +52,7 @@ class tdf96698(UITestCase): select_by_text(xallow, "Custom") xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"NOT(ISERROR(B3))"})) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") xmin = xDialog.getChild("min") @@ -62,7 +62,7 @@ class tdf96698(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A7"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -72,7 +72,7 @@ class tdf96698(UITestCase): select_by_text(xallow, "Custom") xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"ISERROR(FIND(\",\",A7))"})) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") xmin = xDialog.getChild("min") @@ -82,7 +82,7 @@ class tdf96698(UITestCase): gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A8"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -92,7 +92,7 @@ class tdf96698(UITestCase): select_by_text(xallow, "Custom") xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"NOT(ISERROR(A8))"})) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") xmin = xDialog.getChild("min") diff --git a/sc/qa/uitest/validity/validity.py b/sc/qa/uitest/validity/validity.py index a10999c8a9fb..3ac4f790c6cc 100644 --- a/sc/qa/uitest/validity/validity.py +++ b/sc/qa/uitest/validity/validity.py @@ -20,7 +20,7 @@ class validity(UITestCase): document = self.ui_test.get_component() gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xallow = xDialog.getChild("allow") @@ -35,7 +35,7 @@ class validity(UITestCase): xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"1"})) xmax.executeAction("TYPE", mkPropertyValues({"TEXT":"2"})) #reopen and verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation", close_button="cancel") as xDialog: xallow = xDialog.getChild("allow") xallowempty = xDialog.getChild("allowempty") xdata = xDialog.getChild("data") @@ -58,7 +58,7 @@ class validity(UITestCase): document = self.ui_test.get_component() gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") xtsbhelp = xDialog.getChild("tsbhelp") @@ -69,7 +69,7 @@ class validity(UITestCase): xtitle.executeAction("TYPE", mkPropertyValues({"TEXT":"A"})) xinputhelp.executeAction("TYPE", mkPropertyValues({"TEXT":"B"})) #reopen and verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") xtsbhelp = xDialog.getChild("tsbhelp") xtitle = xDialog.getChild("title") @@ -90,7 +90,7 @@ class validity(UITestCase): document = self.ui_test.get_component() gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -102,7 +102,7 @@ class validity(UITestCase): xerroralerttitle.executeAction("TYPE", mkPropertyValues({"TEXT":"Warn"})) xerrorMsg.executeAction("TYPE", mkPropertyValues({"TEXT":"Warn2"})) #reopen and verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:Validation") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") |