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 /sw/qa | |
| 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 'sw/qa')
112 files changed, 310 insertions, 310 deletions
diff --git a/sw/qa/uitest/chapterNumbering/chapterNumbering.py b/sw/qa/uitest/chapterNumbering/chapterNumbering.py index 8b3de300b862..6c34a722c833 100644 --- a/sw/qa/uitest/chapterNumbering/chapterNumbering.py +++ b/sw/qa/uitest/chapterNumbering/chapterNumbering.py @@ -22,7 +22,7 @@ class WriterChapterNumbering(UITestCase): change_measurement_unit(self, "Millimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog: xstyle = xDialog.getChild("style") xnumbering = xDialog.getChild("numbering") xcharstyle = xDialog.getChild("charstyle") @@ -52,7 +52,7 @@ class WriterChapterNumbering(UITestCase): xindentatmf.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog", close_button="cancel") as xDialog: xstyle = xDialog.getChild("style") xnumbering = xDialog.getChild("numbering") diff --git a/sw/qa/uitest/chapterNumbering/tdf123547.py b/sw/qa/uitest/chapterNumbering/tdf123547.py index c7ed6ef08978..81605eb75d5c 100644 --- a/sw/qa/uitest/chapterNumbering/tdf123547.py +++ b/sw/qa/uitest/chapterNumbering/tdf123547.py @@ -15,7 +15,7 @@ class tdf123547(UITestCase): with self.ui_test.load_file(get_url_for_data_file("tdf123547.docx")) as writer_doc: xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") #verify we didn't crash diff --git a/sw/qa/uitest/chapterNumbering/tdf140528.py b/sw/qa/uitest/chapterNumbering/tdf140528.py index 305cb18443a0..dc83265899ef 100644 --- a/sw/qa/uitest/chapterNumbering/tdf140528.py +++ b/sw/qa/uitest/chapterNumbering/tdf140528.py @@ -16,7 +16,7 @@ class Tdf140528(UITestCase): self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog: xTab = xDialog.getChild("tabcontrol") select_pos(xTab, "0") diff --git a/sw/qa/uitest/classification/classification.py b/sw/qa/uitest/classification/classification.py index fbe7e9b093df..e3b4a41e2c99 100644 --- a/sw/qa/uitest/classification/classification.py +++ b/sw/qa/uitest/classification/classification.py @@ -41,7 +41,7 @@ class classification(UITestCase): writer_doc = self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ClassificationDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ClassificationDialog") as xDialog: classificationEditWindow = xDialog.getChild("classificationEditWindow") recentlyUsedCB = xDialog.getChild("recentlyUsedCB") classificationCB = xDialog.getChild("classificationCB") @@ -63,7 +63,7 @@ class classification(UITestCase): #verify watermark #Bug 122586 - Classification: by using the dialog, Watermark text from policy is not placed in the document - with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog: xTextInput = xDialog.getChild("TextInput") xAngle = xDialog.getChild("Angle") xTransparency = xDialog.getChild("Transparency") @@ -77,7 +77,7 @@ class classification(UITestCase): #reopen and verify classification and Content #do the same for Paragraph classification - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog: classificationEditWindow = xDialog.getChild("classificationEditWindow") recentlyUsedCB = xDialog.getChild("recentlyUsedCB") classificationCB = xDialog.getChild("classificationCB") @@ -104,7 +104,7 @@ class classification(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #+ new file and do it only for Paragraph classification (no watermark!) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog: classificationEditWindow = xDialog.getChild("classificationEditWindow") recentlyUsedCB = xDialog.getChild("recentlyUsedCB") classificationCB = xDialog.getChild("classificationCB") @@ -132,7 +132,7 @@ class classification(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #+ new file and do it only for Paragraph classification (no watermark!) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphClassificationDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphClassificationDialog") as xDialog: classificationEditWindow = xDialog.getChild("classificationEditWindow") recentlyUsedCB = xDialog.getChild("recentlyUsedCB") classificationCB = xDialog.getChild("classificationCB") diff --git a/sw/qa/uitest/findReplace/tdf118208.py b/sw/qa/uitest/findReplace/tdf118208.py index 3d1f6e072f7b..b5abcfc83af0 100644 --- a/sw/qa/uitest/findReplace/tdf118208.py +++ b/sw/qa/uitest/findReplace/tdf118208.py @@ -20,7 +20,7 @@ class tdf118208(UITestCase): # 2. Press ctrl-H to show the search and replace dialog. # 3. Press the "Format..." button. #Libreoffice immediately crashed. - 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') # Language Settings @@ -50,7 +50,7 @@ class tdf118208(UITestCase): self.ui_test.close_dialog_through_button(xcloseBtn) #enable lang support again - 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') # Language Settings diff --git a/sw/qa/uitest/macro_tests/tdf124413.py b/sw/qa/uitest/macro_tests/tdf124413.py index ad5a5cf47cfa..a81faffbb34f 100644 --- a/sw/qa/uitest/macro_tests/tdf124413.py +++ b/sw/qa/uitest/macro_tests/tdf124413.py @@ -14,7 +14,7 @@ class tdf124413(UITestCase): self.ui_test.create_doc_in_start_center("writer") #Start LibreOffice. Go to Tools > Macros > Organize Macros > Basic - with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="") as xDialog: #Open Editor xEditBtn = xDialog.getChild("edit") xEditBtn.executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/macro_tests/tdf64690.py b/sw/qa/uitest/macro_tests/tdf64690.py index 318d3e8772d4..26a7bc949131 100644 --- a/sw/qa/uitest/macro_tests/tdf64690.py +++ b/sw/qa/uitest/macro_tests/tdf64690.py @@ -15,7 +15,7 @@ class tdf64690(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="edit"): + with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="edit"): pass xMacroWin = self.xUITest.getTopFocusWindow() diff --git a/sw/qa/uitest/navigator/tdf140257.py b/sw/qa/uitest/navigator/tdf140257.py index 77623bef9649..24bc177d47d7 100644 --- a/sw/qa/uitest/navigator/tdf140257.py +++ b/sw/qa/uitest/navigator/tdf140257.py @@ -14,7 +14,7 @@ class Tdf140257(UITestCase): def change_outline_level(self, sText): - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") diff --git a/sw/qa/uitest/navigator/tdf40427.py b/sw/qa/uitest/navigator/tdf40427.py index 410aa2564d5d..3192dc71d2c1 100644 --- a/sw/qa/uitest/navigator/tdf40427.py +++ b/sw/qa/uitest/navigator/tdf40427.py @@ -21,7 +21,7 @@ class tdf40427(UITestCase): self.assertEqual(2, document.CurrentController.PageCount) # Make sure that the view is 2 pages side-by-side - look at 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: columnssb = xDialog.getChild("columnssb") columns = xDialog.getChild("columns") diff --git a/sw/qa/uitest/options/optionsDialog.py b/sw/qa/uitest/options/optionsDialog.py index 2951892b7143..c7bbcf71ec49 100644 --- a/sw/qa/uitest/options/optionsDialog.py +++ b/sw/qa/uitest/options/optionsDialog.py @@ -11,7 +11,7 @@ class optionsDialog(UITestCase): def test_moreIconsDialog(self): self.ui_test.create_doc_in_start_center("writer") - 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") xLOEntry = xPages.getChild('0') @@ -32,7 +32,7 @@ class optionsDialog(UITestCase): def test_tdf138596(self): self.ui_test.create_doc_in_start_center("writer") - 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") xWriterEntry = xPages.getChild('3') xWriterEntry.executeAction("EXPAND", tuple()) diff --git a/sw/qa/uitest/options/tdf131581.py b/sw/qa/uitest/options/tdf131581.py index 1ca7eb42133c..0c59f076cdf3 100644 --- a/sw/qa/uitest/options/tdf131581.py +++ b/sw/qa/uitest/options/tdf131581.py @@ -14,7 +14,7 @@ class tdf131581(UITestCase): self.xUITest.getTopFocusWindow() - 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") xLOEntry = xPages.getChild('0') diff --git a/sw/qa/uitest/options/tdf78133.py b/sw/qa/uitest/options/tdf78133.py index 4c5803a90247..ac71e642d062 100644 --- a/sw/qa/uitest/options/tdf78133.py +++ b/sw/qa/uitest/options/tdf78133.py @@ -19,7 +19,7 @@ class tdf78133(UITestCase): document = self.ui_test.get_component() #New text document #open option, go to App colors - 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") xLOEntry = xPages.getChild('0') # Lo Dev @@ -30,7 +30,7 @@ class tdf78133(UITestCase): docboundaries = xDialog.getChild("docboundaries") docboundaries.executeAction("CLICK", tuple()) #verify - reopen dialog and check if "text boundaries" is still unchecked - 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") xLOEntry = xPages.getChild('0') # Lo Dev diff --git a/sw/qa/uitest/sidebar/stylesSidebar.py b/sw/qa/uitest/sidebar/stylesSidebar.py index b04869036902..96793b13b4c1 100644 --- a/sw/qa/uitest/sidebar/stylesSidebar.py +++ b/sw/qa/uitest/sidebar/stylesSidebar.py @@ -14,7 +14,7 @@ class StylesSidebar(UITestCase): def test_load_styles_from_template(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:LoadStyles", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:LoadStyles", close_button="") as xDialog: xText = xDialog.getChild("text") xNumbering = xDialog.getChild("numbering") xFrame = xDialog.getChild("frame") diff --git a/sw/qa/uitest/sidebar/tdf133189.py b/sw/qa/uitest/sidebar/tdf133189.py index a48726467a8a..978358f0c2fe 100644 --- a/sw/qa/uitest/sidebar/tdf133189.py +++ b/sw/qa/uitest/sidebar/tdf133189.py @@ -28,7 +28,7 @@ class tdf133189(UITestCase): #change measurement to Inches change_measurement_unit(self, 'Inch') - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") diff --git a/sw/qa/uitest/sidebar/tdf135590.py b/sw/qa/uitest/sidebar/tdf135590.py index 16ce0e7b1c16..b2a86700b5d3 100644 --- a/sw/qa/uitest/sidebar/tdf135590.py +++ b/sw/qa/uitest/sidebar/tdf135590.py @@ -17,7 +17,7 @@ class tdf135590(UITestCase): #change measurement to Centimeter change_measurement_unit(self, 'Centimeter') - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") @@ -37,7 +37,7 @@ class tdf135590(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") diff --git a/sw/qa/uitest/styleInspector/styleInspector.py b/sw/qa/uitest/styleInspector/styleInspector.py index 1d335de070c0..26e5c5be73a3 100644 --- a/sw/qa/uitest/styleInspector/styleInspector.py +++ b/sw/qa/uitest/styleInspector/styleInspector.py @@ -333,7 +333,7 @@ class styleNavigator(UITestCase): # FIXME: neither LO_EXT_SHADING, nor odf:prefix/odf:suffix changes update the View, # so add a temporary bookmark to the text range to trigger the color change immediately - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"): pass self.xUITest.executeCommand(".uno:Undo") diff --git a/sw/qa/uitest/table/insertTableDialog.py b/sw/qa/uitest/table/insertTableDialog.py index ac4d45a10fc4..2bea520282c6 100644 --- a/sw/qa/uitest/table/insertTableDialog.py +++ b/sw/qa/uitest/table/insertTableDialog.py @@ -14,7 +14,7 @@ class WriterInsertTableDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog: xNameEdit = xDialog.getChild("nameedit") @@ -49,14 +49,14 @@ class WriterInsertTableDialog(UITestCase): self.insert_table("Test3", 2, 2) - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableNumberFormatDialog"): + with self.ui_test.execute_dialog_through_command(".uno:TableNumberFormatDialog"): pass self.ui_test.close_doc() def test_cancel_button_insert_table_dialog(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable", close_button="cancel"): pass document = self.ui_test.get_component() diff --git a/sw/qa/uitest/table/splitTable.py b/sw/qa/uitest/table/splitTable.py index ee020ba7324e..cc4c48f28332 100644 --- a/sw/qa/uitest/table/splitTable.py +++ b/sw/qa/uitest/table/splitTable.py @@ -17,7 +17,7 @@ class splitTable(UITestCase): self.xUITest.executeCommand(".uno:GoDown") self.xUITest.executeCommand(".uno:GoDown") #dialog Split table, check Copy heading, OK -> verify 2 tables, 1st has 2 rows, second has 5 rows - with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog: copyheading = xDialog.getChild("copyheading") copyheading.executeAction("CLICK", tuple()) @@ -35,7 +35,7 @@ class splitTable(UITestCase): #go to row 2 self.xUITest.executeCommand(".uno:GoDown") self.xUITest.executeCommand(".uno:GoDown") - with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog: customheading = xDialog.getChild("customheading") customheading.executeAction("CLICK", tuple()) @@ -53,7 +53,7 @@ class splitTable(UITestCase): #go to row 2 self.xUITest.executeCommand(".uno:GoDown") self.xUITest.executeCommand(".uno:GoDown") - with self.ui_test.execute_dialog_through_command_guarded(".uno:SplitTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SplitTable") as xDialog: noheading = xDialog.getChild("noheading") noheading.executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/table/tableProperties.py b/sw/qa/uitest/table/tableProperties.py index ddc817630f9a..86656c45419b 100644 --- a/sw/qa/uitest/table/tableProperties.py +++ b/sw/qa/uitest/table/tableProperties.py @@ -21,7 +21,7 @@ class tableProperties(UITestCase): change_measurement_unit(self, "Centimeter") #dialog Table Properties - Table - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "0") @@ -55,7 +55,7 @@ class tableProperties(UITestCase): belowmf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"})) select_by_text(textdirection, "Left-to-right (LTR)") #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "0") @@ -77,7 +77,7 @@ class tableProperties(UITestCase): self.assertEqual(get_state_as_dict(belowmf)["Text"], "1.00 cm") #dialog Table Properties - Text flow - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") @@ -96,7 +96,7 @@ class tableProperties(UITestCase): vertorient = xDialog.getChild("vertorient") select_by_text(vertorient, "Bottom") #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") @@ -116,7 +116,7 @@ class tableProperties(UITestCase): self.assertEqual(get_state_as_dict(vertorient)["SelectEntryText"], "Bottom") #dialog Table Properties - Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "2") @@ -136,7 +136,7 @@ class tableProperties(UITestCase): # self.ui_test.close_dialog_through_button(xOKBtn) #dialog Table Properties - Borders - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "3") @@ -146,7 +146,7 @@ class tableProperties(UITestCase): mergeadjacent.executeAction("CLICK", tuple()) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "3") sync = xDialog.getChild("sync") @@ -155,7 +155,7 @@ class tableProperties(UITestCase): self.assertEqual(get_state_as_dict(mergeadjacent)["Selected"], "false") #dialog Table Properties - Background - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "4") @@ -177,7 +177,7 @@ class tableProperties(UITestCase): B_custom.executeAction("DOWN", tuple()) #need to refresh HEX value... #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "4") btncolor = xDialog.getChild("btncolor") diff --git a/sw/qa/uitest/table/tableToText.py b/sw/qa/uitest/table/tableToText.py index 944891a4cd01..f5aeb7c500ab 100644 --- a/sw/qa/uitest/table/tableToText.py +++ b/sw/qa/uitest/table/tableToText.py @@ -15,7 +15,7 @@ class tableToText(UITestCase): with self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) as writer_doc: xWriterDoc = self.xUITest.getTopFocusWindow() #dialog Table to text - Tabs; verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog: tabs = xDialog.getChild("tabs") tabs.executeAction("CLICK", tuple()) #verify @@ -26,7 +26,7 @@ class tableToText(UITestCase): self.assertEqual(writer_doc.TextTables.getCount(), 1) #dialog Table to text - Paragraph; verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog: paragraph = xDialog.getChild("paragraph") paragraph.executeAction("CLICK", tuple()) #verify @@ -37,7 +37,7 @@ class tableToText(UITestCase): self.assertEqual(writer_doc.TextTables.getCount(), 1) #dialog Table to text - Semicolons; verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog: semicolons = xDialog.getChild("semicolons") semicolons.executeAction("CLICK", tuple()) #verify @@ -48,7 +48,7 @@ class tableToText(UITestCase): self.assertEqual(writer_doc.TextTables.getCount(), 1) #dialog Table to text - other; verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText") as xDialog: other = xDialog.getChild("other") other.executeAction("CLICK", tuple()) othered = xDialog.getChild("othered") diff --git a/sw/qa/uitest/table/tdf115026.py b/sw/qa/uitest/table/tdf115026.py index 761260110060..d6f46aaedb4f 100644 --- a/sw/qa/uitest/table/tdf115026.py +++ b/sw/qa/uitest/table/tdf115026.py @@ -18,10 +18,10 @@ class tdf115026(UITestCase): self.xUITest.executeCommand(".uno:InsertPagebreak") self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoFormat"): + with self.ui_test.execute_dialog_through_command(".uno:AutoFormat"): pass self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2") diff --git a/sw/qa/uitest/table/tdf116737.py b/sw/qa/uitest/table/tdf116737.py index 887083aa8d53..ac77ec5cd2f0 100644 --- a/sw/qa/uitest/table/tdf116737.py +++ b/sw/qa/uitest/table/tdf116737.py @@ -18,7 +18,7 @@ class tdf116737(UITestCase): document = self.ui_test.get_component() #Insert => Insert Table / It's not possible to select a table style - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog: formatlbinstable = xDialog.getChild("formatlbinstable") entry = formatlbinstable.getChild("11") #Simple List Shaded @@ -26,7 +26,7 @@ class tdf116737(UITestCase): #verify .uno:TableDialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") #tab Background diff --git a/sw/qa/uitest/table/tdf128593.py b/sw/qa/uitest/table/tdf128593.py index 3ff5b26d5b54..d7413a5ccc5f 100755 --- a/sw/qa/uitest/table/tdf128593.py +++ b/sw/qa/uitest/table/tdf128593.py @@ -12,11 +12,11 @@ class tdf128593(UITestCase): MainDoc = self.ui_test.create_doc_in_start_center("writer") MainWindow = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass self.xUITest.executeCommandWithParameters(".uno:TableCellBackgroundColor", mkPropertyValues({"TableCellBackgroundColor" : 16776960 }) ) - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as TablePropertiesDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as TablePropertiesDialog: writer_edit = MainWindow.getChild("writer_edit") writer_edit.executeAction("SELECT", mkPropertyValues({"END_POS": "0", "START_POS": "0"})) tabcontrol = TablePropertiesDialog.getChild("tabcontrol") diff --git a/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py b/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py index 494df2017b2d..9b6689808e99 100644 --- a/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py +++ b/sw/qa/uitest/table/tdf134881_colProportionalAdjust.py @@ -20,7 +20,7 @@ class tdf134881(UITestCase): change_measurement_unit(self, "Centimeter") #dialog Table Properties - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "2") #columns diff --git a/sw/qa/uitest/table/tdf135693.py b/sw/qa/uitest/table/tdf135693.py index 6709b0af98b1..db963bcb68fc 100644 --- a/sw/qa/uitest/table/tdf135693.py +++ b/sw/qa/uitest/table/tdf135693.py @@ -19,7 +19,7 @@ class tdf135693(UITestCase): self.xUITest.executeCommand(".uno:GoDown") # Without the fix in place, this would have crashed here - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xTableDlg: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xTableDlg: xTabs = xTableDlg.getChild("tabcontrol") diff --git a/sw/qa/uitest/table/tdf81292.py b/sw/qa/uitest/table/tdf81292.py index 26aca3e5ed11..3d884b384d97 100644 --- a/sw/qa/uitest/table/tdf81292.py +++ b/sw/qa/uitest/table/tdf81292.py @@ -17,7 +17,7 @@ class tdf81292(UITestCase): #select whole table self.xUITest.executeCommand(".uno:SelectTable") #Tools - Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog: xDown = xDialog.getChild("down1") xDown.executeAction("CLICK", tuple()) #verify diff --git a/sw/qa/uitest/table/tdf99334.py b/sw/qa/uitest/table/tdf99334.py index dfcd2b91db11..b7c53bca5110 100644 --- a/sw/qa/uitest/table/tdf99334.py +++ b/sw/qa/uitest/table/tdf99334.py @@ -17,7 +17,7 @@ class tdf99334(UITestCase): #select whole table self.xUITest.executeCommand(".uno:SelectTable") #Tools - Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog"): + with self.ui_test.execute_dialog_through_command(".uno:SortDialog"): pass #verify tables = writer_doc.getTextTables() diff --git a/sw/qa/uitest/table/textToTable.py b/sw/qa/uitest/table/textToTable.py index c2a958071c58..63cfbb19f02f 100644 --- a/sw/qa/uitest/table/textToTable.py +++ b/sw/qa/uitest/table/textToTable.py @@ -19,7 +19,7 @@ class textToTable(UITestCase): #Enter A;B ; select the text ; dialog Text to table - Semicolon; verify type_text(xWriterEdit, "A;B;C") xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": "0", "END_POS": "5"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTextToTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable") as xDialog: semicolons = xDialog.getChild("semicolons") semicolons.executeAction("CLICK", tuple()) #verify @@ -40,7 +40,7 @@ class textToTable(UITestCase): xWriterEdit = xWriterDoc.getChild("writer_edit") #open file; select all text ; dialog Text to table - other ":"; verify self.xUITest.executeCommand(".uno:SelectAll") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTextToTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable") as xDialog: other = xDialog.getChild("other") other.executeAction("CLICK", tuple()) othered = xDialog.getChild("othered") diff --git a/sw/qa/uitest/ui/fmtui/fmtui.py b/sw/qa/uitest/ui/fmtui/fmtui.py index 6c575d824757..dc71faa23ec3 100644 --- a/sw/qa/uitest/ui/fmtui/fmtui.py +++ b/sw/qa/uitest/ui/fmtui/fmtui.py @@ -18,7 +18,7 @@ class TestTmpdlg(UITestCase): self.ui_test.create_doc_in_start_center("writer") xWriterDoc = self.xUITest.getTopFocusWindow() document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") # Select RID_SVXPAGE_CHAR_EFFECTS. diff --git a/sw/qa/uitest/writer_tests/compareDocuments.py b/sw/qa/uitest/writer_tests/compareDocuments.py index df0315466694..037b12f309d9 100644 --- a/sw/qa/uitest/writer_tests/compareDocuments.py +++ b/sw/qa/uitest/writer_tests/compareDocuments.py @@ -20,7 +20,7 @@ class compareDocuments(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:CompareDocuments", close_button="") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:CompareDocuments", close_button="") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf130960_2.odt")})) @@ -50,7 +50,7 @@ class compareDocuments(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:CompareDocuments", close_button="") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:CompareDocuments", close_button="") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf137855_2.odt")})) diff --git a/sw/qa/uitest/writer_tests/insertCaption.py b/sw/qa/uitest/writer_tests/insertCaption.py index 2bc6e6578ca2..97436a54f73f 100644 --- a/sw/qa/uitest/writer_tests/insertCaption.py +++ b/sw/qa/uitest/writer_tests/insertCaption.py @@ -13,7 +13,7 @@ class insertCaption(UITestCase): def test_insert_caption(self): self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame") as xDialogFr: + with self.ui_test.execute_dialog_through_command(".uno:InsertFrame") as xDialogFr: xWidth = xDialogFr.getChild("width") xWidth.executeAction("UP", tuple()) @@ -26,7 +26,7 @@ class insertCaption(UITestCase): self.assertEqual(document.TextFrames.getCount(), 1) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption: + with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption: xCapt = xDialogCaption.getChild("caption_edit") xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"})) @@ -36,7 +36,7 @@ class insertCaption(UITestCase): self.assertEqual(document.TextFrames[0].Text.String.replace('\r\n', '\n'), "\nText 1: Caption") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption: + with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption: xCapt = xDialogCaption.getChild("caption_edit") xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption2"})) xSep = xDialogCaption.getChild("separator_edit") @@ -45,7 +45,7 @@ class insertCaption(UITestCase): self.assertEqual(document.TextFrames[0].Text.String.replace('\r\n', '\n'), "\nText 1: Caption\nText 2-: Caption2") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption: + with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption: xCapt = xDialogCaption.getChild("caption_edit") xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption3"})) xSep = xDialogCaption.getChild("separator_edit") diff --git a/sw/qa/uitest/writer_tests/tdf134734.py b/sw/qa/uitest/writer_tests/tdf134734.py index 178a25adc080..0bd8f1678612 100644 --- a/sw/qa/uitest/writer_tests/tdf134734.py +++ b/sw/qa/uitest/writer_tests/tdf134734.py @@ -17,7 +17,7 @@ class TestClass(UITestCase): document = self.ui_test.get_component() # set margins and fill color - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog: xTabs = DrawPageDialog.getChild("tabcontrol") select_pos(xTabs, "1") checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize") @@ -49,7 +49,7 @@ class TestClass(UITestCase): self.assertEqual(xStyle.BackgroundFullSize, True) # uncheck it - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog: xTabs = DrawPageDialog.getChild("tabcontrol") select_pos(xTabs, "1") checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize") @@ -64,7 +64,7 @@ class TestClass(UITestCase): self.assertEqual(xStyle.BackgroundFullSize, False) # check it again - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as DrawPageDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as DrawPageDialog: xTabs = DrawPageDialog.getChild("tabcontrol") select_pos(xTabs, "1") checkBackgroundFullSize = DrawPageDialog.getChild("checkBackgroundFullSize") diff --git a/sw/qa/uitest/writer_tests/tdf53460.py b/sw/qa/uitest/writer_tests/tdf53460.py index 1688f155dcb6..5c3fda7b6371 100644 --- a/sw/qa/uitest/writer_tests/tdf53460.py +++ b/sw/qa/uitest/writer_tests/tdf53460.py @@ -17,12 +17,12 @@ class tdf53460(UITestCase): xWriterEdit = xWriterDoc.getChild("writer_edit") document = self.ui_test.get_component() #-insert a table (by default 2x2) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #-put the cursor inside first cell top left for example #-insert an inner table (by default 2x2) inside this cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #-still in top left cell, go to the line after the inner table diff --git a/sw/qa/uitest/writer_tests/tdf78068.py b/sw/qa/uitest/writer_tests/tdf78068.py index f8944196402d..46497f621028 100644 --- a/sw/qa/uitest/writer_tests/tdf78068.py +++ b/sw/qa/uitest/writer_tests/tdf78068.py @@ -19,7 +19,7 @@ class tdf78068(UITestCase): #- add some text type_text(xWriterEdit, "Test") #- go to Format > Paragraph - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") diff --git a/sw/qa/uitest/writer_tests/tdf81457.py b/sw/qa/uitest/writer_tests/tdf81457.py index 496479e33f66..52db731e8723 100644 --- a/sw/qa/uitest/writer_tests/tdf81457.py +++ b/sw/qa/uitest/writer_tests/tdf81457.py @@ -16,7 +16,7 @@ class tdf81457(UITestCase): #tdf 81457 def test_open_documentProperties_tdf81457(self): with self.ui_test.load_file(get_url_for_data_file("tdf81457.odt")) as writer_doc: - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") #tab Custom properties diff --git a/sw/qa/uitest/writer_tests/tdf93068.py b/sw/qa/uitest/writer_tests/tdf93068.py index 2d0177a4f328..2d2830cb1c81 100644 --- a/sw/qa/uitest/writer_tests/tdf93068.py +++ b/sw/qa/uitest/writer_tests/tdf93068.py @@ -18,7 +18,7 @@ class tdf93068(UITestCase): # tdf#135950: Character dialog crashes if multiple cells in a # table are selected - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass self.xUITest.executeCommand(".uno:SelectAll") @@ -26,13 +26,13 @@ class tdf93068(UITestCase): # Check the table is selected self.assertEqual("SwXTextTableCursor", document.CurrentSelection.getImplementationName()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog"): + with self.ui_test.execute_dialog_through_command(".uno:FontDialog"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xFontDlg: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xFontDlg: xDiscardBtn = xFontDlg.getChild("reset") xDiscardBtn.executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/writer_tests/versionDialog.py b/sw/qa/uitest/writer_tests/versionDialog.py index e5a1f1fa0ab5..391558c0095d 100644 --- a/sw/qa/uitest/writer_tests/versionDialog.py +++ b/sw/qa/uitest/writer_tests/versionDialog.py @@ -18,7 +18,7 @@ class versionDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:VersionDialog", close_button="close") as xVersionDialog: + with self.ui_test.execute_dialog_through_command(".uno:VersionDialog", close_button="close") as xVersionDialog: versiondList = xVersionDialog.getChild("versions") diff --git a/sw/qa/uitest/writer_tests/watermark.py b/sw/qa/uitest/writer_tests/watermark.py index 3802ce17f478..3e701c271e49 100644 --- a/sw/qa/uitest/writer_tests/watermark.py +++ b/sw/qa/uitest/writer_tests/watermark.py @@ -16,7 +16,7 @@ class watermark(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Watermark") as xDialog: xTextInput = xDialog.getChild("TextInput") xAngle = xDialog.getChild("Angle") xTransparency = xDialog.getChild("Transparency") @@ -26,7 +26,7 @@ class watermark(UITestCase): xTransparency.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog: xTextInput = xDialog.getChild("TextInput") xAngle = xDialog.getChild("Angle") xTransparency = xDialog.getChild("Transparency") @@ -36,12 +36,12 @@ class watermark(UITestCase): self.assertEqual(get_state_as_dict(xTransparency)["Text"], "51%") - with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Watermark") as xDialog: xTextInput = xDialog.getChild("TextInput") xTextInput.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xTextInput.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:Watermark", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:Watermark", close_button="cancel") as xDialog: xTextInput = xDialog.getChild("TextInput") self.assertEqual(get_state_as_dict(xTextInput)["Text"], "") diff --git a/sw/qa/uitest/writer_tests2/bookmark.py b/sw/qa/uitest/writer_tests2/bookmark.py index 69f395af4c87..acd2bac7747c 100644 --- a/sw/qa/uitest/writer_tests2/bookmark.py +++ b/sw/qa/uitest/writer_tests2/bookmark.py @@ -17,29 +17,29 @@ class bookmarkDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert") as xBookDlg: xBmk = xBookDlg.getChild("bookmarks") self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "1") #check for 1st bookmark exist - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg: xBmk = xBookDlg.getChild("bookmarks") self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "2") #check for 2 bookmarks #now delete one bookmark - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg: xBmk = xBookDlg.getChild("bookmarks") xSecondListEntry = xBmk.getChild("1") # select second bookmark xSecondListEntry.executeAction("SELECT", tuple()) xDelBtn = xBookDlg.getChild("delete") xDelBtn.executeAction("CLICK", tuple()) # delete one bookmark - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg: xBmk2 = xBookDlg.getChild("bookmarks") self.assertEqual(get_state_as_dict(xBmk2)["VisibleCount"], "1") #check for 1 bookmark @@ -48,10 +48,10 @@ class bookmarkDialog(UITestCase): def test_bookmark_dialog_rename(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg: xBmk = xBookDlg.getChild("bookmarks") xFirstListEntry = xBmk.getChild("0") # select first bookmark xFirstListEntry.executeAction("SELECT", tuple()) @@ -74,7 +74,7 @@ class bookmarkDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"): pass type_text(xWriterEdit, "Test for bookmark") @@ -82,10 +82,10 @@ class bookmarkDialog(UITestCase): xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) type_text(xWriterEdit, "Test2 for bookmark") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="insert"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="insert"): pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBookmark", close_button="close") as xBookDlg: + with self.ui_test.execute_dialog_through_command(".uno:InsertBookmark", close_button="close") as xBookDlg: xBmk = xBookDlg.getChild("bookmarks") xFirstListEntry = xBmk.getChild("0") # select first bookmark xFirstListEntry.executeAction("SELECT", tuple()) diff --git a/sw/qa/uitest/writer_tests2/documentProperties.py b/sw/qa/uitest/writer_tests2/documentProperties.py index 0f534276013e..384dc1e1ef62 100644 --- a/sw/qa/uitest/writer_tests2/documentProperties.py +++ b/sw/qa/uitest/writer_tests2/documentProperties.py @@ -30,7 +30,7 @@ class documentProperties(UITestCase): def test_open_documentProperties_writer(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog: xResetBtn = xDialog.getChild("reset") xResetBtn.executeAction("CLICK", tuple()) @@ -96,7 +96,7 @@ class documentProperties(UITestCase): xUpdateBtn.executeAction("CLICK", tuple()) #now open the dialog again and read the properties - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties", close_button="cancel") as xDialog: xTitleText = xDialog.getChild("title") xSubjectText = xDialog.getChild("subject") xKeywordsText = xDialog.getChild("keywords") diff --git a/sw/qa/uitest/writer_tests2/exchangeDatabase.py b/sw/qa/uitest/writer_tests2/exchangeDatabase.py index bba8a8bc1aee..1cf43237c3b8 100644 --- a/sw/qa/uitest/writer_tests2/exchangeDatabase.py +++ b/sw/qa/uitest/writer_tests2/exchangeDatabase.py @@ -14,7 +14,7 @@ class exchangeDB(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField", close_button="close"): + with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField", close_button="close"): pass self.ui_test.close_doc() @@ -23,7 +23,7 @@ class exchangeDB(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField") as xExDBDlg: + with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField") as xExDBDlg: xTreelist = xExDBDlg.getChild("availablelb") xLabeldb = xExDBDlg.getChild("dbnameft") @@ -36,7 +36,7 @@ class exchangeDB(UITestCase): xTreeEntry2 = xTreeEntry.getChild('0') #Available Databases xTreeEntry2.executeAction("SELECT", tuple()) #Click on the biblio - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChangeDatabaseField", close_button="close") as xExDBDlg: + with self.ui_test.execute_dialog_through_command(".uno:ChangeDatabaseField", close_button="close") as xExDBDlg: xLabeldb = xExDBDlg.getChild("dbnameft") self.assertEqual(get_state_as_dict(xLabeldb)["Text"], "Bibliography.biblio") diff --git a/sw/qa/uitest/writer_tests2/fontworks.py b/sw/qa/uitest/writer_tests2/fontworks.py index 489bf3a120a8..b9ab330dfda0 100644 --- a/sw/qa/uitest/writer_tests2/fontworks.py +++ b/sw/qa/uitest/writer_tests2/fontworks.py @@ -19,7 +19,7 @@ class fontWorksDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontworkGalleryFloater", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontworkGalleryFloater", close_button="cancel") as xDialog: FontWorkSelector = xDialog.getChild("ctlFavoriteswin") # Select element with id (3) element3 = FontWorkSelector.getChild("2") diff --git a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py index 93a67bd8152e..0d0f7dcf1b9f 100644 --- a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py +++ b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py @@ -21,7 +21,7 @@ class formatBulletsNumbering(UITestCase): change_measurement_unit(self, "Millimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xalignedatmf = xDialog.getChild("alignedatmf") @@ -35,7 +35,7 @@ class formatBulletsNumbering(UITestCase): xindentatmf.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xalignedatmf = xDialog.getChild("alignedatmf") @@ -56,14 +56,14 @@ class formatBulletsNumbering(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xnumfollowedbylb = xDialog.getChild("numfollowedbylb") select_by_text(xnumfollowedbylb, "Space") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xnumfollowedbylb = xDialog.getChild("numfollowedbylb") @@ -77,7 +77,7 @@ class formatBulletsNumbering(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") xnumfmtlb = xDialog.getChild("numfmtlb") @@ -96,7 +96,7 @@ class formatBulletsNumbering(UITestCase): xallsame.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") xnumfmtlb = xDialog.getChild("numfmtlb") @@ -114,10 +114,10 @@ class formatBulletsNumbering(UITestCase): self.assertEqual(get_state_as_dict(xallsame)["Selected"], "true") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="user") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="user") as xDialog: pass - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") xnumfmtlb = xDialog.getChild("numfmtlb") @@ -145,7 +145,7 @@ class formatBulletsNumbering(UITestCase): change_measurement_unit(self, "Millimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -153,7 +153,7 @@ class formatBulletsNumbering(UITestCase): xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) #TAB to move indent right - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -161,7 +161,7 @@ class formatBulletsNumbering(UITestCase): self.assertEqual(indentValue < indentValue2 , True) xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "BACKSPACE"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -177,7 +177,7 @@ class formatBulletsNumbering(UITestCase): change_measurement_unit(self, "Millimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -185,7 +185,7 @@ class formatBulletsNumbering(UITestCase): self.xUITest.executeCommand(".uno:DecrementSubLevels") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -193,7 +193,7 @@ class formatBulletsNumbering(UITestCase): self.assertEqual(indentValue < indentValue2 , True) self.xUITest.executeCommand(".uno:IncrementLevel") - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xindentatmf = xDialog.getChild("indentatmf") @@ -208,7 +208,7 @@ class formatBulletsNumbering(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # Test Bullet Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: # Select the BulletPage's Selector xTabs = xDialog.getChild("tabcontrol") @@ -229,7 +229,7 @@ class formatBulletsNumbering(UITestCase): # Test other Pages - with self.ui_test.execute_dialog_through_command_guarded(".uno:BulletsAndNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog") as xDialog: # Select the NumberingPage's Selector xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py index 00660cc233b5..e6829b7f8c84 100644 --- a/sw/qa/uitest/writer_tests2/formatCharacter.py +++ b/sw/qa/uitest/writer_tests2/formatCharacter.py @@ -18,7 +18,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") @@ -39,7 +39,7 @@ class formatCharacter(UITestCase): select_pos(xLangFontEast, "0") select_pos(xLangFontCTL, "0") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xSizeFont = xDialog.getChild("westsizelb-cjk") xSizeFontEast = xDialog.getChild("eastsizelb") xSizeFontCTL = xDialog.getChild("ctlsizelb") @@ -62,7 +62,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") @@ -85,7 +85,7 @@ class formatCharacter(UITestCase): select_pos(xPosition, "1") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") @@ -115,7 +115,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") @@ -135,7 +135,7 @@ class formatCharacter(UITestCase): self.xUITest.executeCommand(".uno:GoLeft") self.assertEqual(document.Text.String[0:11], "LibreOffice") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") xURL = xDialog.getChild("urled") @@ -157,7 +157,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") @@ -165,7 +165,7 @@ class formatCharacter(UITestCase): xTwolines.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") xTwolines = xDialog.getChild("twolines") @@ -178,7 +178,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -199,7 +199,7 @@ class formatCharacter(UITestCase): xFitToLine.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") xSuperscript = xDialog.getChild("superscript") @@ -225,7 +225,7 @@ class formatCharacter(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -233,7 +233,7 @@ class formatCharacter(UITestCase): xScalewidth.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") xScalewidth = xDialog.getChild("scalewidthsb") diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py index a46864544744..ffd583e937af 100644 --- a/sw/qa/uitest/writer_tests2/formatParagraph.py +++ b/sw/qa/uitest/writer_tests2/formatParagraph.py @@ -19,7 +19,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") @@ -44,7 +44,7 @@ class formatParagraph(UITestCase): xActivate.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xBeforeText = xDialog.getChild("spinED_LEFTINDENT") @@ -75,7 +75,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") @@ -94,7 +94,7 @@ class formatParagraph(UITestCase): xExpandChk.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") @@ -120,7 +120,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -153,7 +153,7 @@ class formatParagraph(UITestCase): xcheckKeepPara.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") @@ -193,7 +193,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") @@ -206,7 +206,7 @@ class formatParagraph(UITestCase): xcheckApplySpacing.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "3") @@ -226,7 +226,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") @@ -241,7 +241,7 @@ class formatParagraph(UITestCase): xParaSpin.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") @@ -265,7 +265,7 @@ class formatParagraph(UITestCase): change_measurement_unit(self, "Centimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -287,7 +287,7 @@ class formatParagraph(UITestCase): xNewButtn.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -305,7 +305,7 @@ class formatParagraph(UITestCase): self.assertEqual(get_state_as_dict(xED_TABPOS)["Text"], "1.00 cm") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -317,7 +317,7 @@ class formatParagraph(UITestCase): xUnderscore.executeAction("CLICK", tuple()) xNewButtn.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -327,7 +327,7 @@ class formatParagraph(UITestCase): self.assertEqual(get_state_as_dict(xUnderscore)["Checked"], "true") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -339,7 +339,7 @@ class formatParagraph(UITestCase): xDashLine.executeAction("CLICK", tuple()) xNewButtn.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -349,7 +349,7 @@ class formatParagraph(UITestCase): self.assertEqual(get_state_as_dict(xDashLine)["Checked"], "true") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -361,7 +361,7 @@ class formatParagraph(UITestCase): xPointsLine.executeAction("CLICK", tuple()) xNewButtn.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "5") @@ -378,7 +378,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") @@ -396,7 +396,7 @@ class formatParagraph(UITestCase): xText.executeAction("TYPE", mkPropertyValues({"TEXT":"A"})) select_by_text(xCharStyle, "Definition") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "6") @@ -422,7 +422,7 @@ class formatParagraph(UITestCase): change_measurement_unit(self, "Centimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "7") @@ -445,7 +445,7 @@ class formatParagraph(UITestCase): xMerge.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "7") @@ -472,7 +472,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "8") @@ -494,7 +494,7 @@ class formatParagraph(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "9") @@ -505,7 +505,7 @@ class formatParagraph(UITestCase): xTranText.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "9") @@ -516,7 +516,7 @@ class formatParagraph(UITestCase): self.assertEqual(get_state_as_dict(xTranText)["Text"], "51%") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "9") @@ -535,7 +535,7 @@ class formatParagraph(UITestCase): xEnd.executeAction("UP", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "9") diff --git a/sw/qa/uitest/writer_tests2/horizontalLine.py b/sw/qa/uitest/writer_tests2/horizontalLine.py index dddaada8bdea..641210c2dff0 100644 --- a/sw/qa/uitest/writer_tests2/horizontalLine.py +++ b/sw/qa/uitest/writer_tests2/horizontalLine.py @@ -19,14 +19,14 @@ class WriterInsertHorizontalLine(UITestCase): self.xUITest.executeCommand(".uno:StyleApply?Style:string=Horizontal%20Line&FamilyName:string=ParagraphStyles") #insert horizontal line - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog: xStyleNametxt = xDialog.getChild("name") self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line") #check style name self.xUITest.executeCommand(".uno:Undo") self.xUITest.executeCommand(".uno:Redo") - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditStyle", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditStyle", close_button="cancel") as xDialog: xStyleNametxt = xDialog.getChild("name") self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line") #check style name diff --git a/sw/qa/uitest/writer_tests2/pasteSpecial.py b/sw/qa/uitest/writer_tests2/pasteSpecial.py index ae1ee10be4c6..b080d7f86ab8 100644 --- a/sw/qa/uitest/writer_tests2/pasteSpecial.py +++ b/sw/qa/uitest/writer_tests2/pasteSpecial.py @@ -21,7 +21,7 @@ class PasteSpecial(UITestCase): self.xUITest.executeCommand(".uno:SelectAll") self.xUITest.executeCommand(".uno:Copy") - 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') xChild = xList.getChild(str(i)) diff --git a/sw/qa/uitest/writer_tests2/tdf116474.py b/sw/qa/uitest/writer_tests2/tdf116474.py index 8f6fc8951a6b..c56c8c1052e0 100644 --- a/sw/qa/uitest/writer_tests2/tdf116474.py +++ b/sw/qa/uitest/writer_tests2/tdf116474.py @@ -24,7 +24,7 @@ class tdf116474(UITestCase): #select image document.getCurrentController().select(document.getDrawPage()[0]) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertCaptionDialog") as xDialogCaption: + with self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") as xDialogCaption: xCapt = xDialogCaption.getChild("caption_edit") xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"})) diff --git a/sw/qa/uitest/writer_tests3/autoredactDialog.py b/sw/qa/uitest/writer_tests3/autoredactDialog.py index 2ea73bccfc47..fb306b32c54b 100644 --- a/sw/qa/uitest/writer_tests3/autoredactDialog.py +++ b/sw/qa/uitest/writer_tests3/autoredactDialog.py @@ -39,7 +39,7 @@ class AutoRedactDialog(UITestCase): def test_add_target(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog: xAddBtn = xDialog.getChild("add") # Make sure we are starting with an empty targets list @@ -79,7 +79,7 @@ class AutoRedactDialog(UITestCase): self.assertEqual(child_text[2], targets_list[i][1]) #content # Now let's make sure the dialog remembers last state - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog: xTargetsListbox = xDialog.getChild("targets") targets_box_state_dict = get_state_as_dict(xTargetsListbox) self.assertEqual(int(targets_box_state_dict["Children"]), len(targets_list)) @@ -96,7 +96,7 @@ class AutoRedactDialog(UITestCase): def test_edit_target(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:AutoRedactDoc", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:AutoRedactDoc", close_button="cancel") as xDialog: xAddBtn = xDialog.getChild("add") xEditBtn = xDialog.getChild("edit") diff --git a/sw/qa/uitest/writer_tests3/customizeDialog.py b/sw/qa/uitest/writer_tests3/customizeDialog.py index 3e9a9cbf9fd7..187ff67a3f59 100644 --- a/sw/qa/uitest/writer_tests3/customizeDialog.py +++ b/sw/qa/uitest/writer_tests3/customizeDialog.py @@ -16,14 +16,14 @@ class ConfigureDialog(UITestCase): def test_open_ConfigureDialog_writer(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel"): pass self.ui_test.close_doc() def test_search_filter(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog: xfunc = xDialog.getChild("functions") xSearch = xDialog.getChild("searchEntry") @@ -61,7 +61,7 @@ class ConfigureDialog(UITestCase): def test_category_listbox(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog: xFunc = xDialog.getChild("functions") xCategory = xDialog.getChild("commandcategorylist") @@ -87,7 +87,7 @@ class ConfigureDialog(UITestCase): # Without the fix in place, calling customize dialog after inserting # a formula object would crash - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel"): pass self.ui_test.close_doc() @@ -95,7 +95,7 @@ class ConfigureDialog(UITestCase): def test_gear_button_menu(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConfigureDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog", close_button="cancel") as xDialog: # Open the New Menu Dialog with id = 0 xmenugearbtn=xDialog.getChild("menugearbtn") diff --git a/sw/qa/uitest/writer_tests3/goToPage.py b/sw/qa/uitest/writer_tests3/goToPage.py index 3a6220fa2a27..1d35966ebb84 100644 --- a/sw/qa/uitest/writer_tests3/goToPage.py +++ b/sw/qa/uitest/writer_tests3/goToPage.py @@ -14,20 +14,20 @@ class GoToPage_dialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog: xPageText = xDialog.getChild("page") xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"2"})) self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2") - with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog: xPageText = xDialog.getChild("page") xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"3a"})) self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3") # check cancel button - with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:GotoPage", close_button="cancel"): pass self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3") diff --git a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py index 890cb10fb7cf..82c4d9d92817 100644 --- a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py +++ b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py @@ -21,7 +21,7 @@ class HyperlinkDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") MainWindow = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog", close_button="cancel") as xDialog: # Test the vertical tab xtab=xDialog.getChild("tabcontrol") @@ -51,7 +51,7 @@ class HyperlinkDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") xMainWindow = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog") as xDialog: # insert link xtab=xDialog.getChild("tabcontrol") @@ -93,7 +93,7 @@ class HyperlinkDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() xWriterEdit = xWriterDoc.getChild("writer_edit") - with self.ui_test.execute_dialog_through_command_guarded(".uno:HyperlinkDialog", close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:HyperlinkDialog", close_button="") as xDialog: xHelp = xDialog.getChild("help") xHelp.executeAction('FOCUS', tuple()) diff --git a/sw/qa/uitest/writer_tests3/insertEnvelope.py b/sw/qa/uitest/writer_tests3/insertEnvelope.py index a0cf97cd22f9..2de03efa94e4 100644 --- a/sw/qa/uitest/writer_tests3/insertEnvelope.py +++ b/sw/qa/uitest/writer_tests3/insertEnvelope.py @@ -16,7 +16,7 @@ class WriterInsertEnvelope(UITestCase): def test_insert_envelope(self): self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope", close_button="user") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope", close_button="user") as xDialog: xAddrTxt= xDialog.getChild("addredit") xSenderTxt = xDialog.getChild("senderedit") xSenderCheckBox = xDialog.getChild("sender") @@ -29,7 +29,7 @@ class WriterInsertEnvelope(UITestCase): xSenderTxt.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xSenderTxt.executeAction("TYPE", mkPropertyValues({"TEXT":"Sender"})) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertEnvelope", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope", close_button="cancel") as xDialog: xAddrTxt= xDialog.getChild("addredit") xSenderTxt = xDialog.getChild("senderedit") self.assertEqual(get_state_as_dict(xAddrTxt)["Text"], "Address") diff --git a/sw/qa/uitest/writer_tests3/insertFootEndnote.py b/sw/qa/uitest/writer_tests3/insertFootEndnote.py index c5e3c8078870..88570af7c0e1 100644 --- a/sw/qa/uitest/writer_tests3/insertFootEndnote.py +++ b/sw/qa/uitest/writer_tests3/insertFootEndnote.py @@ -15,14 +15,14 @@ class insertFootEndnote(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() #Automatic - Footnote - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog"): + with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog"): pass self.assertEqual(document.Footnotes.getCount(), 1) self.xUITest.executeCommand(".uno:Undo") self.assertEqual(document.Footnotes.getCount(), 0) #Automatic - Endnote - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog: xEndnote = xDialog.getChild("endnote") xEndnote.executeAction("CLICK", tuple()) @@ -30,7 +30,7 @@ class insertFootEndnote(UITestCase): self.xUITest.executeCommand(".uno:Undo") self.assertEqual(document.Endnotes.getCount(), 0) #Character - Footnote - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog: xChar = xDialog.getChild("character") xChar.executeAction("CLICK", tuple()) xCharentry = xDialog.getChild("characterentry") @@ -41,7 +41,7 @@ class insertFootEndnote(UITestCase): self.assertEqual(document.Footnotes.getCount(), 0) #Character - Endnote - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog") as xDialog: xChar = xDialog.getChild("character") xChar.executeAction("CLICK", tuple()) xCharentry = xDialog.getChild("characterentry") @@ -55,7 +55,7 @@ class insertFootEndnote(UITestCase): self.assertEqual(document.Endnotes.getCount(), 0) #Cancel button - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFootnoteDialog", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:InsertFootnoteDialog", close_button="cancel"): pass self.ui_test.close_doc() diff --git a/sw/qa/uitest/writer_tests3/insertPageFooter.py b/sw/qa/uitest/writer_tests3/insertPageFooter.py index 034952077d17..a471268a054c 100644 --- a/sw/qa/uitest/writer_tests3/insertPageFooter.py +++ b/sw/qa/uitest/writer_tests3/insertPageFooter.py @@ -27,7 +27,7 @@ class WriterInsertPageFooter(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.FooterIsOn, True) - with self.ui_test.execute_dialog_through_command_guarded( + with self.ui_test.execute_dialog_through_command( ".uno:InsertPageFooter?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"): pass @@ -48,7 +48,7 @@ class WriterInsertPageFooter(UITestCase): self.insert_footer() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass document = self.ui_test.get_component() diff --git a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py index be74dc6d2355..6fe58c90a47e 100644 --- a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py +++ b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py @@ -16,7 +16,7 @@ class insertQrCode(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # 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") @@ -25,7 +25,7 @@ class insertQrCode(UITestCase): document.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") @@ -49,7 +49,7 @@ class insertQrCode(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - 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/sw/qa/uitest/writer_tests3/insertSignatureLine.py b/sw/qa/uitest/writer_tests3/insertSignatureLine.py index 7c44f2253d39..f1aa3146fb73 100644 --- a/sw/qa/uitest/writer_tests3/insertSignatureLine.py +++ b/sw/qa/uitest/writer_tests3/insertSignatureLine.py @@ -16,7 +16,7 @@ class insertSignatureLine(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # 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 @@ -25,7 +25,7 @@ class insertSignatureLine(UITestCase): document.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") @@ -56,7 +56,7 @@ class insertSignatureLine(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - 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/sw/qa/uitest/writer_tests3/lineNumbering.py b/sw/qa/uitest/writer_tests3/lineNumbering.py index 20e77a30db7c..374e40c1f57f 100644 --- a/sw/qa/uitest/writer_tests3/lineNumbering.py +++ b/sw/qa/uitest/writer_tests3/lineNumbering.py @@ -19,7 +19,7 @@ class WriterLineNumbering(UITestCase): change_measurement_unit(self, "Centimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog") as xDialog: xshownumbering = xDialog.getChild("shownumbering") xstyledropdown = xDialog.getChild("styledropdown") xformatdropdown = xDialog.getChild("formatdropdown") @@ -46,7 +46,7 @@ class WriterLineNumbering(UITestCase): xshowfooterheadernumbering.executeAction("CLICK", tuple()) xrestarteverynewpage.executeAction("CLICK", tuple()) - with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog", close_button="cancel") as xDialog: xshownumbering = xDialog.getChild("shownumbering") xstyledropdown = xDialog.getChild("styledropdown") xformatdropdown = xDialog.getChild("formatdropdown") @@ -78,7 +78,7 @@ class WriterLineNumbering(UITestCase): self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:LineNumberingDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog", close_button="cancel") as xDialog: xshownumbering = xDialog.getChild("shownumbering") xformatdropdown = xDialog.getChild("formatdropdown") diff --git a/sw/qa/uitest/writer_tests3/pageDialog.py b/sw/qa/uitest/writer_tests3/pageDialog.py index 196876ed1e01..b509a106b2a1 100644 --- a/sw/qa/uitest/writer_tests3/pageDialog.py +++ b/sw/qa/uitest/writer_tests3/pageDialog.py @@ -118,14 +118,14 @@ class WriterPageDialog(UITestCase): buttons = ['btnbitmap', 'btncolor', 'btngradient', 'btnhatch', 'btnpattern'] for index, button in enumerate(buttons): - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "2") self.click_button(xDialog, button) self.check_default_area(button) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "2") @@ -147,7 +147,7 @@ class WriterPageDialog(UITestCase): for i in range(30): with self.subTest(i=i): - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") xFormatList = xDialog.getChild("comboPageFormat") @@ -167,7 +167,7 @@ class WriterPageDialog(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.IsLandscape, False) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") self.click_button(xDialog, 'radiobuttonLandscape') @@ -175,7 +175,7 @@ class WriterPageDialog(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.IsLandscape, True) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") self.click_button(xDialog, 'radiobuttonPortrait') @@ -196,7 +196,7 @@ class WriterPageDialog(UITestCase): for i in range(4): with self.subTest(i=i): - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "1") @@ -214,7 +214,7 @@ class WriterPageDialog(UITestCase): def test_cancel_button_page_dialog(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog: pass self.ui_test.close_doc() diff --git a/sw/qa/uitest/writer_tests3/sort.py b/sw/qa/uitest/writer_tests3/sort.py index 948f8bbe0b99..5bd2f70d4df6 100644 --- a/sw/qa/uitest/writer_tests3/sort.py +++ b/sw/qa/uitest/writer_tests3/sort.py @@ -25,7 +25,7 @@ class WriterSort(UITestCase): selection = self.xUITest.executeCommand(".uno:SelectAll") #select whole text #Tools - Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog: xDown = xDialog.getChild("down1") xDown.executeAction("CLICK", tuple()) #check @@ -45,7 +45,7 @@ class WriterSort(UITestCase): selection = self.xUITest.executeCommand(".uno:SelectAll") #select whole text #Tools - Sort - with self.ui_test.execute_dialog_through_command_guarded(".uno:SortDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SortDialog") as xDialog: xDown = xDialog.getChild("down1") xcolsb1 = xDialog.getChild("colsb1") xtypelb1 = xDialog.getChild("typelb1") diff --git a/sw/qa/uitest/writer_tests3/specialCharacter.py b/sw/qa/uitest/writer_tests3/specialCharacter.py index 420a9c3fb630..d0617bc8baea 100644 --- a/sw/qa/uitest/writer_tests3/specialCharacter.py +++ b/sw/qa/uitest/writer_tests3/specialCharacter.py @@ -21,7 +21,7 @@ class specialCharacter(UITestCase): document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSymbol", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertSymbol", close_button="cancel") as xDialog: xCharSet = xDialog.getChild("showcharset") # default charset xCharSet.executeAction("SELECT", mkPropertyValues({"COLUMN": "1", "ROW": "4"})) # digit 4 selected @@ -33,7 +33,7 @@ class specialCharacter(UITestCase): self.assertEqual(get_state_as_dict(xDecText)["Text"], "52") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSymbol", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertSymbol", close_button="cancel") as xDialog: xComboFont = xDialog.getChild("fontlb") select_pos(xComboFont, "0") # select font diff --git a/sw/qa/uitest/writer_tests3/tdf79236.py b/sw/qa/uitest/writer_tests3/tdf79236.py index 1f9089d11499..9f23d035da77 100644 --- a/sw/qa/uitest/writer_tests3/tdf79236.py +++ b/sw/qa/uitest/writer_tests3/tdf79236.py @@ -30,7 +30,7 @@ class tdf79236(UITestCase): self.assertEqual(document.CurrentSelection.getByIndex(0).String, "Test for tdf79236") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xParagraphDlg: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xParagraphDlg: @@ -63,7 +63,7 @@ class tdf79236(UITestCase): self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 5503) self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 3704) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ParagraphDialog") as xParagraphDlg: + with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xParagraphDlg: xLeftSpnBtn = xParagraphDlg.getChild("spinED_LEFTINDENT") diff --git a/sw/qa/uitest/writer_tests4/insertBreakDialog.py b/sw/qa/uitest/writer_tests4/insertBreakDialog.py index f0c4101501f8..3af079774dc4 100644 --- a/sw/qa/uitest/writer_tests4/insertBreakDialog.py +++ b/sw/qa/uitest/writer_tests4/insertBreakDialog.py @@ -18,7 +18,7 @@ class WriterInsertBreakDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog: xOption = xDialog.getChild("linerb") xOption.executeAction("CLICK", tuple()) @@ -30,7 +30,7 @@ class WriterInsertBreakDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog: xOption = xDialog.getChild("columnrb") xOption.executeAction("CLICK", tuple()) @@ -44,7 +44,7 @@ class WriterInsertBreakDialog(UITestCase): for i in range(9): with self.subTest(i=i): - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertBreak") as xDialog: xOption = xDialog.getChild("pagerb") xOption.executeAction("CLICK", tuple()) @@ -60,7 +60,7 @@ class WriterInsertBreakDialog(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertBreak", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:InsertBreak", close_button="cancel"): pass self.getPages(1) diff --git a/sw/qa/uitest/writer_tests4/insertPageHeader.py b/sw/qa/uitest/writer_tests4/insertPageHeader.py index 42c2df3d84fc..ebe94b145f8c 100644 --- a/sw/qa/uitest/writer_tests4/insertPageHeader.py +++ b/sw/qa/uitest/writer_tests4/insertPageHeader.py @@ -26,7 +26,7 @@ class WriterInsertPageHeader(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.HeaderIsOn, True) - with self.ui_test.execute_dialog_through_command_guarded( + with self.ui_test.execute_dialog_through_command( ".uno:InsertPageHeader?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"): pass @@ -47,7 +47,7 @@ class WriterInsertPageHeader(UITestCase): self.insert_header() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass document = self.ui_test.get_component() diff --git a/sw/qa/uitest/writer_tests4/tdf113252.py b/sw/qa/uitest/writer_tests4/tdf113252.py index 69ebc0b0b34d..8bcd3736ffec 100644 --- a/sw/qa/uitest/writer_tests4/tdf113252.py +++ b/sw/qa/uitest/writer_tests4/tdf113252.py @@ -18,7 +18,7 @@ class tdf113252(UITestCase): xWriterEdit = xWriterDoc.getChild("writer_edit") #Start LibreOffice. Go to Tools > Macros > Organize Macros > Basic - with self.ui_test.execute_dialog_through_command_guarded(".uno:MacroDialog", close_button="close") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:MacroDialog", close_button="close") as xDialog: #Click Button Organizer xorganize = xDialog.getChild("organize") diff --git a/sw/qa/uitest/writer_tests4/tdf113284.py b/sw/qa/uitest/writer_tests4/tdf113284.py index 2bd253f1ec8f..32d8c4144cef 100644 --- a/sw/qa/uitest/writer_tests4/tdf113284.py +++ b/sw/qa/uitest/writer_tests4/tdf113284.py @@ -18,14 +18,14 @@ class tdf113284(UITestCase): xToolkit.processEventsToIdle() xPageCount = writer_doc.CurrentController.PageCount - with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog: xPageText = xDialog.getChild("page") xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":str(xPageCount)})) # goto last page xToolkit.processEventsToIdle() self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], str(xPageCount)) - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex", close_button="cancel"): pass #page count is not constant diff --git a/sw/qa/uitest/writer_tests4/tdf115572.py b/sw/qa/uitest/writer_tests4/tdf115572.py index 7abfcae3f365..1f1a0e6e1850 100644 --- a/sw/qa/uitest/writer_tests4/tdf115572.py +++ b/sw/qa/uitest/writer_tests4/tdf115572.py @@ -19,7 +19,7 @@ class tdf115572(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -33,7 +33,7 @@ class tdf115572(UITestCase): self.xUITest.executeCommand(".uno:GoLeft") self.xUITest.executeCommand(".uno:GoLeft") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") @@ -46,7 +46,7 @@ class tdf115572(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -57,7 +57,7 @@ class tdf115572(UITestCase): #delete column self.xUITest.executeCommand(".uno:DeleteColumns") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") diff --git a/sw/qa/uitest/writer_tests4/tdf115573.py b/sw/qa/uitest/writer_tests4/tdf115573.py index 5e40d8c09420..cbbf8ea48367 100644 --- a/sw/qa/uitest/writer_tests4/tdf115573.py +++ b/sw/qa/uitest/writer_tests4/tdf115573.py @@ -19,7 +19,7 @@ class tdf115573(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -33,7 +33,7 @@ class tdf115573(UITestCase): self.xUITest.executeCommand(".uno:GoUp") self.xUITest.executeCommand(".uno:GoUp") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") @@ -46,7 +46,7 @@ class tdf115573(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -60,7 +60,7 @@ class tdf115573(UITestCase): self.xUITest.executeCommand(".uno:GoUp") self.xUITest.executeCommand(".uno:GoUp") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") @@ -73,7 +73,7 @@ class tdf115573(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -82,7 +82,7 @@ class tdf115573(UITestCase): #insert column left self.xUITest.executeCommand(".uno:InsertColumnsBefore") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") @@ -95,7 +95,7 @@ class tdf115573(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #insert table 2x2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #select font format - Bold and write text "abc" self.xUITest.executeCommand(".uno:Bold") @@ -104,7 +104,7 @@ class tdf115573(UITestCase): #insert column left self.xUITest.executeCommand(".uno:InsertColumnsAfter") #check the format of the text (should be still bold) Format-Character-Font-Style-Bold - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "0") xweststylelbcjk = xDialog.getChild("weststylelb-cjk") diff --git a/sw/qa/uitest/writer_tests4/tdf122449.py b/sw/qa/uitest/writer_tests4/tdf122449.py index 23c57ef6b64e..c071745d024c 100644 --- a/sw/qa/uitest/writer_tests4/tdf122449.py +++ b/sw/qa/uitest/writer_tests4/tdf122449.py @@ -31,11 +31,11 @@ class tdf122449(UITestCase): self.ui_test.close_dialog_through_button(xcloseBtn) xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "HOME"})) # invoke Index dialog Index entry .uno:IndexEntryDialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:IndexEntryDialog", close_button="close"): + with self.ui_test.execute_dialog_through_command(".uno:IndexEntryDialog", close_button="close"): pass # close # Go to page 2 - with self.ui_test.execute_dialog_through_command_guarded(".uno:GotoPage") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog: xPageText = xDialog.getChild("page") xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"2"})) # verify diff --git a/sw/qa/uitest/writer_tests4/tdf138546.py b/sw/qa/uitest/writer_tests4/tdf138546.py index 4cbec4d3a49c..761aa26e523b 100644 --- a/sw/qa/uitest/writer_tests4/tdf138546.py +++ b/sw/qa/uitest/writer_tests4/tdf138546.py @@ -18,14 +18,14 @@ class tdf138546(UITestCase): change_measurement_unit(self, "Centimeter") #dialog Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatColumns", close_button="cancel") as xDialog: colsnf = xDialog.getChild("colsnf") width1mf = xDialog.getChild("width1mf") self.assertEqual(get_state_as_dict(colsnf)["Text"], "2") self.assertEqual((get_state_as_dict(width1mf)["Text"])[0:3], "2.0") #2.00 cm - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, "7") #Columns colsnf = xDialog.getChild("colsnf") diff --git a/sw/qa/uitest/writer_tests4/tdf51352.py b/sw/qa/uitest/writer_tests4/tdf51352.py index 773f9518fa89..9382c8ef7792 100644 --- a/sw/qa/uitest/writer_tests4/tdf51352.py +++ b/sw/qa/uitest/writer_tests4/tdf51352.py @@ -19,11 +19,11 @@ class tdf51352(UITestCase): #1. New a text document #2. Insert a table and then in one cell create another table #-insert a table (by default 2x2) - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #-put the cursor inside first cell top left for example #-insert an inner table (by default 2x2) inside this cell - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable"): + with self.ui_test.execute_dialog_through_command(".uno:InsertTable"): pass #3. Select the first table xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"})) @@ -33,7 +33,7 @@ class tdf51352(UITestCase): xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"})) self.assertEqual(document.TextTables.getCount(), 2) #4. From menu "Table->Convert->Table to Text - with self.ui_test.execute_dialog_through_command_guarded(".uno:ConvertTableToText"): + with self.ui_test.execute_dialog_through_command(".uno:ConvertTableToText"): pass self.assertEqual(document.TextTables.getCount(), 0) #5. Undo/Redo diff --git a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py index 815de4f9dc2f..fb4a3098d19f 100644 --- a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py +++ b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py @@ -15,7 +15,7 @@ class dateFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") @@ -29,7 +29,7 @@ class dateFormFieldDialog(UITestCase): # open the dialog again - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") self.assertEqual(get_state_as_dict(itemsList)["SelectEntryText"], "12-31") @@ -40,7 +40,7 @@ class dateFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") @@ -56,7 +56,7 @@ class dateFormFieldDialog(UITestCase): self.assertEqual(writer_doc.getText().getString(), "07/17/19") # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") @@ -79,7 +79,7 @@ class dateFormFieldDialog(UITestCase): self.assertEqual(writer_doc.getText().getString(), "[select date]") # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") @@ -105,7 +105,7 @@ class dateFormFieldDialog(UITestCase): self.assertEqual(writer_doc.getText().getString(), "07/17/19") # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("date_formats_treeview") diff --git a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py index f37691efa313..2ba000000a1b 100644 --- a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py +++ b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py @@ -17,7 +17,7 @@ class dropDownFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemEntry = xDialog.getChild("item_entry") addButton = xDialog.getChild("add_button") @@ -49,7 +49,7 @@ class dropDownFormFieldDialog(UITestCase): # check whether items are the same after reopening - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("items_treeview") self.assertEqual(get_state_as_dict(itemsList)["Children"], "4") @@ -66,7 +66,7 @@ class dropDownFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemEntry = xDialog.getChild("item_entry") addButton = xDialog.getChild("add_button") @@ -110,7 +110,7 @@ class dropDownFormFieldDialog(UITestCase): # check whether items are the same after reopening - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("items_treeview") removeButton = xDialog.getChild("remove_button") @@ -136,7 +136,7 @@ class dropDownFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemEntry = xDialog.getChild("item_entry") addButton = xDialog.getChild("add_button") @@ -200,7 +200,7 @@ class dropDownFormFieldDialog(UITestCase): # check whether items are the same after reopening - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("items_treeview") self.assertEqual(get_state_as_dict(itemsList)["Children"], "4") @@ -219,7 +219,7 @@ class dropDownFormFieldDialog(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() # open the dialog (cursor is at the field) - with self.ui_test.execute_dialog_through_command_guarded(".uno:ControlProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ControlProperties") as xDialog: itemsList = xDialog.getChild("items_treeview") diff --git a/sw/qa/uitest/writer_tests5/about_test.py b/sw/qa/uitest/writer_tests5/about_test.py index ab301efa0074..83117572d72e 100644 --- a/sw/qa/uitest/writer_tests5/about_test.py +++ b/sw/qa/uitest/writer_tests5/about_test.py @@ -13,7 +13,7 @@ class AboutDlgTest(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:About", close_button="btnClose"): + with self.ui_test.execute_dialog_through_command(".uno:About", close_button="btnClose"): pass self.ui_test.close_doc() diff --git a/sw/qa/uitest/writer_tests5/autocorrectOptions.py b/sw/qa/uitest/writer_tests5/autocorrectOptions.py index 828fdd26a661..4417837d33e7 100644 --- a/sw/qa/uitest/writer_tests5/autocorrectOptions.py +++ b/sw/qa/uitest/writer_tests5/autocorrectOptions.py @@ -16,7 +16,7 @@ class autocorrectOptions(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - 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/sw/qa/uitest/writer_tests5/columns.py b/sw/qa/uitest/writer_tests5/columns.py index 172f4fbf4f0d..fc3827fc5d85 100644 --- a/sw/qa/uitest/writer_tests5/columns.py +++ b/sw/qa/uitest/writer_tests5/columns.py @@ -19,7 +19,7 @@ class columns(UITestCase): change_measurement_unit(self, "Centimeter") #dialog Columns - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatColumns") as xDialog: colsnf = xDialog.getChild("colsnf") colsnf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) @@ -34,7 +34,7 @@ class columns(UITestCase): autowidth = xDialog.getChild("autowidth") autowidth.executeAction("CLICK", tuple()) #verify - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatColumns", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FormatColumns", close_button="cancel") as xDialog: colsnf = xDialog.getChild("colsnf") spacing1mf = xDialog.getChild("spacing1mf") autowidth = xDialog.getChild("autowidth") diff --git a/sw/qa/uitest/writer_tests5/tdf107494.py b/sw/qa/uitest/writer_tests5/tdf107494.py index 5939c6f18eb2..c1a066c5586c 100644 --- a/sw/qa/uitest/writer_tests5/tdf107494.py +++ b/sw/qa/uitest/writer_tests5/tdf107494.py @@ -38,7 +38,7 @@ class tdf107494(UITestCase): textGraphic.Graphic = graphic text.insertTextContent(cursor, textGraphic, False) # Delete the header - with self.ui_test.execute_dialog_through_command_guarded( + with self.ui_test.execute_dialog_through_command( ".uno:InsertPageHeader?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"): pass @@ -73,7 +73,7 @@ class tdf107494(UITestCase): textGraphic.Graphic = graphic text.insertTextContent(cursor, textGraphic, False) # Delete the footer - with self.ui_test.execute_dialog_through_command_guarded( + with self.ui_test.execute_dialog_through_command( ".uno:InsertPageFooter?PageStyle:string=Default%20Page%20Style&On:bool=false", close_button="yes"): pass diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py b/sw/qa/uitest/writer_tests5/tdf118540.py index 947d9115e2e6..e33cad63b888 100644 --- a/sw/qa/uitest/writer_tests5/tdf118540.py +++ b/sw/qa/uitest/writer_tests5/tdf118540.py @@ -16,7 +16,7 @@ class tdf118540(UITestCase): def test_tdf118540_preview_document_properties(self): with self.ui_test.load_file(get_url_for_data_file("tdf118540.docx")) as writer_doc: self.xUITest.executeCommand(".uno:PrintPreview") #open print preview - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties"): + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties"): pass self.xUITest.executeCommand(".uno:ClosePreview") # close print preview diff --git a/sw/qa/uitest/writer_tests5/tdf122045.py b/sw/qa/uitest/writer_tests5/tdf122045.py index cf625f7344f7..a6b3a6348516 100644 --- a/sw/qa/uitest/writer_tests5/tdf122045.py +++ b/sw/qa/uitest/writer_tests5/tdf122045.py @@ -16,7 +16,7 @@ class tdf122045(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "2") diff --git a/sw/qa/uitest/writer_tests5/tdf122722.py b/sw/qa/uitest/writer_tests5/tdf122722.py index 67e9ccb5ff53..090337dd2273 100644 --- a/sw/qa/uitest/writer_tests5/tdf122722.py +++ b/sw/qa/uitest/writer_tests5/tdf122722.py @@ -27,7 +27,7 @@ class tdf122722(UITestCase): #6. Opened Character, Select "Font Effect" tab #7. Check Hidden, and click [OK] #8. Crash a LibreOffice - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") @@ -43,7 +43,7 @@ class tdf122722(UITestCase): xHidden.executeAction("CLICK", tuple()) #un-hidden - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") diff --git a/sw/qa/uitest/writer_tests5/tdf123446.py b/sw/qa/uitest/writer_tests5/tdf123446.py index 6d9c3a2c9e73..a337efafe840 100644 --- a/sw/qa/uitest/writer_tests5/tdf123446.py +++ b/sw/qa/uitest/writer_tests5/tdf123446.py @@ -26,7 +26,7 @@ class tdf123446(UITestCase): self.xUITest.executeCommand(".uno:GoLeft") self.xUITest.executeCommand(".uno:GoLeft") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertMultiIndex"): + with self.ui_test.execute_dialog_through_command(".uno:InsertMultiIndex"): pass #- Undo the ToC insertion. self.xUITest.executeCommand(".uno:Undo") diff --git a/sw/qa/uitest/writer_tests5/titlePage.py b/sw/qa/uitest/writer_tests5/titlePage.py index 390e0bb4fa68..06b8b8ea3eb0 100644 --- a/sw/qa/uitest/writer_tests5/titlePage.py +++ b/sw/qa/uitest/writer_tests5/titlePage.py @@ -13,7 +13,7 @@ class titlePage(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #select new Pages; nr of pages =2 (click UP), save; verify pageCount = 3 newPages = xDialog.getChild("RB_INSERT_NEW_PAGES") newPages.executeAction("CLICK", tuple()) @@ -22,7 +22,7 @@ class titlePage(UITestCase): self.assertEqual(document.CurrentController.PageCount, 3) # check cancel button - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog", close_button="cancel"): pass self.assertEqual(document.CurrentController.PageCount, 3) diff --git a/sw/qa/uitest/writer_tests5/titlePageWizard.py b/sw/qa/uitest/writer_tests5/titlePageWizard.py index b2b43ce3f9ca..c47e23c10d62 100644 --- a/sw/qa/uitest/writer_tests5/titlePageWizard.py +++ b/sw/qa/uitest/writer_tests5/titlePageWizard.py @@ -36,7 +36,7 @@ class tdf138907(UITestCase): #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #set restart page number to 2. With this doc, it defaults to resetting to 1. xRestartNumbering = xDialog.getChild("NF_RESTART_NUMBERING") xRestartNumbering.executeAction("UP", tuple()) # restart numbering at 2 @@ -51,7 +51,7 @@ class tdf138907(UITestCase): self.assertEqual(Para2.PageDescName, "Landscape") #re-run dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog"): + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog"): pass # Without this fix, re-running the wizard was failing with the title page restarting at page 2. @@ -69,7 +69,7 @@ class tdf138907(UITestCase): #Now test replacing several pages with title and index styles #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #Convert three pages to title/index pages starting at page two. xPageCount = xDialog.getChild("NF_PAGE_COUNT") for _ in range(0,2): @@ -101,7 +101,7 @@ class tdf138907(UITestCase): #Now test inserting at the end of the document #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #Insert three title/index pages at the end of the document (plus a content page). newPages = xDialog.getChild("RB_INSERT_NEW_PAGES") newPages.executeAction("CLICK", tuple()) @@ -129,7 +129,7 @@ class tdf138907(UITestCase): #Now test inserting in the middle of the document #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #Insert three title/index pages starting at page 2. newPages = xDialog.getChild("RB_INSERT_NEW_PAGES") newPages.executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/writer_tests5/titlePageWizard2.py b/sw/qa/uitest/writer_tests5/titlePageWizard2.py index b3f7d15c3320..313638de9eae 100644 --- a/sw/qa/uitest/writer_tests5/titlePageWizard2.py +++ b/sw/qa/uitest/writer_tests5/titlePageWizard2.py @@ -15,7 +15,7 @@ class tdf138907(UITestCase): # Test an undefined situation - try to modify pages beyond the end of the document. #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #set restart page number to 2. With this doc, it defaults to resetting to 1. xRestartNumbering = xDialog.getChild("NF_RESTART_NUMBERING") xRestartNumbering.executeAction("UP", tuple()) # restart numbering at 2 @@ -53,7 +53,7 @@ class tdf138907(UITestCase): #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: #set restart page number to 1 - which is the default. #set restart title page to 1 - the current value for this document is 6. xRestartNumbering = xDialog.getChild("NF_SET_PAGE_NUMBER") @@ -90,7 +90,7 @@ class tdf138907(UITestCase): #Now test replacing several pages with title and index styles #dialog Title Page - with self.ui_test.execute_dialog_through_command_guarded(".uno:TitlePageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TitlePageDialog") as xDialog: print(xDialog.getChildren()) #Convert four pages to title/index pages starting at page one. xPageCount = xDialog.getChild("NF_PAGE_COUNT") diff --git a/sw/qa/uitest/writer_tests5/zoom.py b/sw/qa/uitest/writer_tests5/zoom.py index 05024eeed487..7e647e622fbd 100644 --- a/sw/qa/uitest/writer_tests5/zoom.py +++ b/sw/qa/uitest/writer_tests5/zoom.py @@ -15,7 +15,7 @@ class writerZoom(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() #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 Optimal & Automatic - OK - open and verify optimal = xDialog.getChild("optimal") @@ -23,7 +23,7 @@ class writerZoom(UITestCase): automatic = xDialog.getChild("automatic") automatic.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: optimal = xDialog.getChild("optimal") automatic = xDialog.getChild("automatic") self.assertEqual(get_state_as_dict(optimal)["Checked"], "true") @@ -34,7 +34,7 @@ class writerZoom(UITestCase): fitwandh.executeAction("CLICK", tuple()) singlepage.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: singlepage = xDialog.getChild("singlepage") fitwandh = xDialog.getChild("fitwandh") self.assertEqual(get_state_as_dict(singlepage)["Checked"], "true") @@ -49,7 +49,7 @@ class writerZoom(UITestCase): columnssb.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) columnssb.executeAction("TYPE", mkPropertyValues({"TEXT":"3"})) - 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: fitw = xDialog.getChild("fitw") columnssb = xDialog.getChild("columnssb") columns = xDialog.getChild("columns") @@ -62,7 +62,7 @@ class writerZoom(UITestCase): x100pc.executeAction("CLICK", tuple()) automatic.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: automatic = xDialog.getChild("automatic") x100pc = xDialog.getChild("100pc") self.assertEqual(get_state_as_dict(automatic)["Checked"], "true") @@ -75,7 +75,7 @@ class writerZoom(UITestCase): zoomsb.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) zoomsb.executeAction("TYPE", mkPropertyValues({"TEXT":"101"})) - 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: variable = xDialog.getChild("variable") zoomsb = xDialog.getChild("zoomsb") self.assertEqual(get_state_as_dict(variable)["Checked"], "true") diff --git a/sw/qa/uitest/writer_tests6/tdf107847.py b/sw/qa/uitest/writer_tests6/tdf107847.py index 99705d6c2203..9fc02be4e8ac 100644 --- a/sw/qa/uitest/writer_tests6/tdf107847.py +++ b/sw/qa/uitest/writer_tests6/tdf107847.py @@ -15,7 +15,7 @@ class tdf107847(UITestCase): document = self.ui_test.get_component() xWriterDoc = self.xUITest.getTopFocusWindow() - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertFrame") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "1") select_pos(xTabs, "2") diff --git a/sw/qa/uitest/writer_tests6/tdf120731.py b/sw/qa/uitest/writer_tests6/tdf120731.py index fdcc17dcd334..b7a7f53f10d8 100644 --- a/sw/qa/uitest/writer_tests6/tdf120731.py +++ b/sw/qa/uitest/writer_tests6/tdf120731.py @@ -15,7 +15,7 @@ class tdf120731(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() self.xUITest.executeCommand(".uno:SelectAll") - with self.ui_test.execute_dialog_through_command_guarded(".uno:FontDialog"): + with self.ui_test.execute_dialog_through_command(".uno:FontDialog"): pass self.assertEqual(writer_doc.Text.String[0:5], "Lorem") # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests6/tdf124586.py b/sw/qa/uitest/writer_tests6/tdf124586.py index 23c5e5700a69..a8d056fced63 100644 --- a/sw/qa/uitest/writer_tests6/tdf124586.py +++ b/sw/qa/uitest/writer_tests6/tdf124586.py @@ -16,13 +16,13 @@ class tdf124586(UITestCase): xWriterDoc = self.xUITest.getTopFocusWindow() #Goto Tools > Chapter Numbering. - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog: xstyle = xDialog.getChild("style") select_by_text(xstyle, "MyHeading") self.assertEqual(writer_doc.Text.String[0:8], "Schritte") - with self.ui_test.execute_dialog_through_command_guarded(".uno:ChapterNumberingDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog") as xDialog: xstyle = xDialog.getChild("style") self.assertEqual(get_state_as_dict(xstyle)["SelectEntryText"], "MyHeading") # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py b/sw/qa/uitest/writer_tests6/tdf125104.py index 8b56104f123a..c27482195753 100644 --- a/sw/qa/uitest/writer_tests6/tdf125104.py +++ b/sw/qa/uitest/writer_tests6/tdf125104.py @@ -30,19 +30,19 @@ class tdf125104(UITestCase): self.assertEqual(text[2:3], "2") # Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes crashes when trying to change Page settings later - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: self.set_combo_layout_format(xDialog, "1st, 2nd, 3rd, ...") text = document.Text.String.replace('\r\n', '\n') self.assertEqual(text[0:3], "1st") self.assertEqual(text[4:7], "2nd") - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog", close_button="cancel") as xDialog: comboLayoutFormat = xDialog.getChild("comboLayoutFormat") self.assertEqual(get_state_as_dict(comboLayoutFormat)["SelectEntryText"], "1st, 2nd, 3rd, ...") # change to devanagari alphabet format - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: self.set_combo_layout_format(xDialog, "क, ख, ग, ...") text = document.Text.String.replace('\r\n', '\n') @@ -50,7 +50,7 @@ class tdf125104(UITestCase): self.assertEqual(text[2:3], "ख") # change to devanagari number format - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: self.set_combo_layout_format(xDialog, "१, २, ३, ...") text = document.Text.String.replace('\r\n', '\n') diff --git a/sw/qa/uitest/writer_tests6/tdf126017.py b/sw/qa/uitest/writer_tests6/tdf126017.py index 6894b550b479..b2255c31cdeb 100644 --- a/sw/qa/uitest/writer_tests6/tdf126017.py +++ b/sw/qa/uitest/writer_tests6/tdf126017.py @@ -25,13 +25,13 @@ class tdf126017(UITestCase): xcloseBtn = xDialog.getChild("close") self.ui_test.close_dialog_through_button(xcloseBtn) #edit index - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex") as xDiagIndex: + with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex") as xDiagIndex: title = xDiagIndex.getChild("title") title.executeAction("TYPE", mkPropertyValues({"TEXT":"aaaa"})) self.xUITest.executeCommand(".uno:Undo") - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditCurIndex") as xDiagIndex: + with self.ui_test.execute_dialog_through_command(".uno:EditCurIndex") as xDiagIndex: title = xDiagIndex.getChild("title") title.executeAction("TYPE", mkPropertyValues({"TEXT":"aaaa"})) diff --git a/sw/qa/uitest/writer_tests6/tdf126168.py b/sw/qa/uitest/writer_tests6/tdf126168.py index 5d65724c4bf1..8c9794a17545 100644 --- a/sw/qa/uitest/writer_tests6/tdf126168.py +++ b/sw/qa/uitest/writer_tests6/tdf126168.py @@ -18,11 +18,11 @@ class tdf126168(UITestCase): #2) Menu > Insert > Frame > Frame #3) Press OK in Frame dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertFrame"): + with self.ui_test.execute_dialog_through_command(".uno:InsertFrame"): pass self.assertEqual(document.TextFrames.getCount(), 1) #New Style from Selection [uno:StyleNewByExample] - with self.ui_test.execute_dialog_through_command_guarded(".uno:StyleNewByExample") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:StyleNewByExample") as xDialog: #5) Enter a name in the Create Style dialog and press OK stylename = xDialog.getChild("stylename") stylename.executeAction("TYPE", mkPropertyValues({"TEXT":"a"})) diff --git a/sw/qa/uitest/writer_tests6/tdf126226.py b/sw/qa/uitest/writer_tests6/tdf126226.py index c638574d141d..4dfc6c1e7817 100644 --- a/sw/qa/uitest/writer_tests6/tdf126226.py +++ b/sw/qa/uitest/writer_tests6/tdf126226.py @@ -15,7 +15,7 @@ class Tdf126226(UITestCase): self.xUITest.executeCommand(".uno:SelectAll") # Without the fix in place, this test would have crashed here - with self.ui_test.execute_dialog_through_command_guarded(".uno:CommentChangeTracking") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:CommentChangeTracking") as xDialog: self.assertEqual("Hello\n", get_state_as_dict(xDialog.getChild("edit"))["Text"]) diff --git a/sw/qa/uitest/writer_tests6/tdf128431.py b/sw/qa/uitest/writer_tests6/tdf128431.py index 2e53b2eb8054..f09d23597fcd 100644 --- a/sw/qa/uitest/writer_tests6/tdf128431.py +++ b/sw/qa/uitest/writer_tests6/tdf128431.py @@ -17,7 +17,7 @@ class tdf128431(UITestCase): change_measurement_unit(self, "Centimeter") - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, 6) #borders diff --git a/sw/qa/uitest/writer_tests6/tdf131041.py b/sw/qa/uitest/writer_tests6/tdf131041.py index 8ba2fc2fabbb..4c07a5516d6f 100644 --- a/sw/qa/uitest/writer_tests6/tdf131041.py +++ b/sw/qa/uitest/writer_tests6/tdf131041.py @@ -13,7 +13,7 @@ class tdf131041(UITestCase): self.ui_test.create_doc_in_start_center("writer") document = self.ui_test.get_component() - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog: tabcontrol = xDialog.getChild("tabcontrol") select_pos(tabcontrol, 4) #header diff --git a/sw/qa/uitest/writer_tests7/apply_line_cap.py b/sw/qa/uitest/writer_tests7/apply_line_cap.py index 9e308acc0ff8..7df47a6b52b5 100644 --- a/sw/qa/uitest/writer_tests7/apply_line_cap.py +++ b/sw/qa/uitest/writer_tests7/apply_line_cap.py @@ -22,7 +22,7 @@ class apply_line_cap(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # line setting dialog window - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: # get cap style combo box xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE") @@ -46,7 +46,7 @@ class apply_line_cap(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # line setting dialog window - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: # get cap style combo box xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE") @@ -71,7 +71,7 @@ class apply_line_cap(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # line setting dialog window - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: # get cap style combo box xCapStyle = xFormatLineDlg.getChild("LB_CAP_STYLE") diff --git a/sw/qa/uitest/writer_tests7/tdf104795.py b/sw/qa/uitest/writer_tests7/tdf104795.py index 00b71bb2b97c..98be1cf366b2 100644 --- a/sw/qa/uitest/writer_tests7/tdf104795.py +++ b/sw/qa/uitest/writer_tests7/tdf104795.py @@ -14,7 +14,7 @@ class tdf104795(UITestCase): def test_tdf104795(self): with self.ui_test.load_file(get_url_for_data_file("tdf104795.odt")) as writer_doc: - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog: sShowSignedText = get_state_as_dict(xDialog.getChild('showsigned'))['Text'] diff --git a/sw/qa/uitest/writer_tests7/tdf109083.py b/sw/qa/uitest/writer_tests7/tdf109083.py index eb83582b4431..500bc7150ddc 100644 --- a/sw/qa/uitest/writer_tests7/tdf109083.py +++ b/sw/qa/uitest/writer_tests7/tdf109083.py @@ -18,7 +18,7 @@ class tdf109083(UITestCase): #generate two 2x2 tables with the same autoformat table style (Default Table Style) #Note that this style is different than applying nothing! for i in range(0, 2): - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertTable") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog: formatlbinstable = xDialog.getChild("formatlbinstable") entry = formatlbinstable.getChild("1") entry.executeAction("SELECT", tuple()) @@ -45,7 +45,7 @@ class tdf109083(UITestCase): #first row's cells must be yellow, second/last row's cells must be updated to yellow by now for i in range (0,4): - with self.ui_test.execute_dialog_through_command_guarded(".uno:TableDialog") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog: xTabs = xDialog.getChild("tabcontrol") select_pos(xTabs, "4") #tab Background btncolor = xDialog.getChild("btncolor") diff --git a/sw/qa/uitest/writer_tests7/tdf115853.py b/sw/qa/uitest/writer_tests7/tdf115853.py index 05825bf15043..fb0a0966a27c 100644 --- a/sw/qa/uitest/writer_tests7/tdf115853.py +++ b/sw/qa/uitest/writer_tests7/tdf115853.py @@ -16,7 +16,7 @@ class tdf115853(UITestCase): def test_tdf115853(self): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog: xTabs = xDialog.getChild("tabcontrol") diff --git a/sw/qa/uitest/writer_tests7/tdf119661.py b/sw/qa/uitest/writer_tests7/tdf119661.py index afdbba2dd99c..e1464b962c99 100644 --- a/sw/qa/uitest/writer_tests7/tdf119661.py +++ b/sw/qa/uitest/writer_tests7/tdf119661.py @@ -17,7 +17,7 @@ class tdf119661(UITestCase): self.ui_test.create_doc_in_start_center("writer") - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertGraphic", close_button="") as xOpenDialog: + with self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", close_button="") as xOpenDialog: xFileName = xOpenDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("LibreOffice.jpg")})) @@ -34,7 +34,7 @@ class tdf119661(UITestCase): xOK = xWarnDialog.getChild("ok") self.ui_test.close_dialog_through_button(xOK) - with self.ui_test.execute_dialog_through_command_guarded(".uno:LinkDialog", close_button="close") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:LinkDialog", close_button="close") as xDialog: sLinks = "TB_LINKS" @@ -57,7 +57,7 @@ class tdf119661(UITestCase): xFilePath = os.path.join(tempdir, "tdf119661-tmp.odt") # Save Copy as - with self.ui_test.execute_dialog_through_command_guarded(".uno:SaveAs", close_button="open") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SaveAs", close_button="open") as xDialog: xFileName = xDialog.getChild("file_name") xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) diff --git a/sw/qa/uitest/writer_tests7/tdf122780.py b/sw/qa/uitest/writer_tests7/tdf122780.py index a128f95eaf1c..957ef31dfd13 100644 --- a/sw/qa/uitest/writer_tests7/tdf122780.py +++ b/sw/qa/uitest/writer_tests7/tdf122780.py @@ -14,7 +14,7 @@ class tdf122780(UITestCase): def test_tdf122780(self): with self.ui_test.load_file(get_url_for_data_file("tdf122780.docx")) as writer_doc: - with self.ui_test.execute_dialog_through_command_guarded(".uno:SetDocumentProperties") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") as xDialog: # Without the fix in place, this test would have hung here self.assertEqual("Normal_x005F", get_state_as_dict(xDialog.getChild('showtemplate'))['Text'][:12]) diff --git a/sw/qa/uitest/writer_tests7/tdf131936.py b/sw/qa/uitest/writer_tests7/tdf131936.py index 07298084b2a7..773386b658ff 100644 --- a/sw/qa/uitest/writer_tests7/tdf131936.py +++ b/sw/qa/uitest/writer_tests7/tdf131936.py @@ -12,7 +12,7 @@ class tdf131936(UITestCase): def test_tdf131936_saveas_docx_version(self): with self.ui_test.load_file(get_url_for_data_file("tdf131936.docx")): - with self.ui_test.execute_dialog_through_command_guarded(".uno:SaveAs", close_button="cancel") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:SaveAs", close_button="cancel") as xDialog: time.sleep(DEFAULT_SLEEP) xFileTypeCombo = xDialog.getChild("file_type") state = get_state_as_dict(xFileTypeCombo) diff --git a/sw/qa/uitest/writer_tests7/tdf132169.py b/sw/qa/uitest/writer_tests7/tdf132169.py index 2466a7cb5545..393b6e1fa098 100644 --- a/sw/qa/uitest/writer_tests7/tdf132169.py +++ b/sw/qa/uitest/writer_tests7/tdf132169.py @@ -23,7 +23,7 @@ class tdf132169(UITestCase): self.assertEqual(get_state_as_dict(xLineMetric)["Text"], "0.0 pt") #Check changing value from dialog also works - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: xWidth = xFormatLineDlg.getChild('MTR_FLD_LINE_WIDTH') type_text(xWidth, "4.0") diff --git a/sw/qa/uitest/writer_tests7/tdf133348.py b/sw/qa/uitest/writer_tests7/tdf133348.py index c5ebb726f4f9..a479b408a856 100644 --- a/sw/qa/uitest/writer_tests7/tdf133348.py +++ b/sw/qa/uitest/writer_tests7/tdf133348.py @@ -21,7 +21,7 @@ class tdf133348(UITestCase): xArgs = mkPropertyValues({"Text": "C1"}) self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", xArgs) - 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") xEntry = xPages.getChild('0') xEntry.executeAction("EXPAND", tuple()) diff --git a/sw/qa/uitest/writer_tests7/tdf134243.py b/sw/qa/uitest/writer_tests7/tdf134243.py index 1e1c4a5db3f4..7ee7976ce18b 100644 --- a/sw/qa/uitest/writer_tests7/tdf134243.py +++ b/sw/qa/uitest/writer_tests7/tdf134243.py @@ -13,7 +13,7 @@ class tdf134243(UITestCase): with self.ui_test.load_file(get_url_for_data_file("tdf134243.odt")) as writer_doc: # Without the fix in place, it would hung launching the mailmerge wizard - with self.ui_test.execute_dialog_through_command_guarded(".uno:MailMergeWizard", close_button="cancel"): + with self.ui_test.execute_dialog_through_command(".uno:MailMergeWizard", close_button="cancel"): pass # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests7/tdf137802.py b/sw/qa/uitest/writer_tests7/tdf137802.py index c91642c2f9a3..424375b3df38 100644 --- a/sw/qa/uitest/writer_tests7/tdf137802.py +++ b/sw/qa/uitest/writer_tests7/tdf137802.py @@ -25,7 +25,7 @@ class tdf137802(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') - 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: xDialog.getChild('topage').executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/writer_tests7/tdf137803.py b/sw/qa/uitest/writer_tests7/tdf137803.py index 3fceb5cb814e..b1621adf55dd 100644 --- a/sw/qa/uitest/writer_tests7/tdf137803.py +++ b/sw/qa/uitest/writer_tests7/tdf137803.py @@ -18,7 +18,7 @@ class tdf137803(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # open textattrs dialog - with self.ui_test.execute_dialog_through_command_guarded(".uno:TextAttributes") as TextDialog: + with self.ui_test.execute_dialog_through_command(".uno:TextAttributes") as TextDialog: # check autosize on TSB_AUTOGROW_SIZE = TextDialog.getChild('TSB_AUTOGROW_SIZE') diff --git a/sw/qa/uitest/writer_tests7/tdf139301.py b/sw/qa/uitest/writer_tests7/tdf139301.py index d62e0db3c290..e34dce1fb31b 100644 --- a/sw/qa/uitest/writer_tests7/tdf139301.py +++ b/sw/qa/uitest/writer_tests7/tdf139301.py @@ -22,7 +22,7 @@ class tdf139301(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # line setting dialog window - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: # get line style combo box xLineStyle = xFormatLineDlg.getChild("LB_LINE_STYLE") @@ -45,7 +45,7 @@ class tdf139301(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') # line setting dialog window - with self.ui_test.execute_dialog_through_command_guarded(".uno:FormatLine") as xFormatLineDlg: + with self.ui_test.execute_dialog_through_command(".uno:FormatLine") as xFormatLineDlg: # get line style combo box xLineStyle = xFormatLineDlg.getChild("LB_LINE_STYLE") diff --git a/sw/qa/uitest/writer_tests7/tdf140117.py b/sw/qa/uitest/writer_tests7/tdf140117.py index 07437903f755..bf3c69874e25 100644 --- a/sw/qa/uitest/writer_tests7/tdf140117.py +++ b/sw/qa/uitest/writer_tests7/tdf140117.py @@ -45,7 +45,7 @@ class tdf140117(UITestCase): elif i == 2: self.assertEqual("XXXXleft", xHeaderLeftText) - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as PageDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as PageDialog: xTabs = PageDialog.getChild("tabcontrol") select_pos(xTabs, "4") diff --git a/sw/qa/uitest/writer_tests7/tdf140863.py b/sw/qa/uitest/writer_tests7/tdf140863.py index bb558c15590b..a1a926af8223 100644 --- a/sw/qa/uitest/writer_tests7/tdf140863.py +++ b/sw/qa/uitest/writer_tests7/tdf140863.py @@ -15,7 +15,7 @@ class tdf140863(UITestCase): self.ui_test.create_doc_in_start_center("writer") # Insert one section - with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertSection"): + with self.ui_test.execute_dialog_through_command(".uno:InsertSection"): pass xWriterDoc = self.xUITest.getTopFocusWindow() @@ -31,7 +31,7 @@ class tdf140863(UITestCase): self.assertTrue(document.TextSections.Section1.IsVisible) - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditRegion") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditRegion") as xDialog: xHide = xDialog.getChild('hide') self.assertEqual('false', get_state_as_dict(xHide)['Selected']) @@ -42,7 +42,7 @@ class tdf140863(UITestCase): self.assertFalse(document.TextSections.Section1.IsVisible) self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "1") - with self.ui_test.execute_dialog_through_command_guarded(".uno:EditRegion") as xDialog: + with self.ui_test.execute_dialog_through_command(".uno:EditRegion") as xDialog: xHide = xDialog.getChild('hide') self.assertEqual('true', get_state_as_dict(xHide)['Selected']) diff --git a/sw/qa/uitest/writer_tests7/tdf141557.py b/sw/qa/uitest/writer_tests7/tdf141557.py index 0a15db24dd50..820505f2f43f 100644 --- a/sw/qa/uitest/writer_tests7/tdf141557.py +++ b/sw/qa/uitest/writer_tests7/tdf141557.py @@ -23,7 +23,7 @@ class tdf141557(UITestCase): self.ui_test.wait_until_child_is_available('metricfield') - 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: xDialog.getChild('topara').executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/writer_tests7/tdf46561.py b/sw/qa/uitest/writer_tests7/tdf46561.py index 41acea93ed16..0eb14bc613c3 100644 --- a/sw/qa/uitest/writer_tests7/tdf46561.py +++ b/sw/qa/uitest/writer_tests7/tdf46561.py @@ -37,7 +37,7 @@ class tdf46561(UITestCase): # Switch "same left and right page headers" on and off a few times for _ in range(4): - with self.ui_test.execute_dialog_through_command_guarded(".uno:PageDialog") as PageDialog: + with self.ui_test.execute_dialog_through_command(".uno:PageDialog") as PageDialog: xTabs = PageDialog.getChild("tabcontrol") select_pos(xTabs, "4") diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py b/sw/qa/uitest/writer_tests7/tdf90401.py index fd8c9b91b135..40b9b483153f 100644 --- a/sw/qa/uitest/writer_tests7/tdf90401.py +++ b/sw/qa/uitest/writer_tests7/tdf90401.py @@ -30,7 +30,7 @@ class tdf90401(UITestCase): # enable remove personal info security option - with self.ui_test.execute_dialog_through_command_guarded('.uno:OptionsTreeDialog', close_button="") as xDialog: + with self.ui_test.execute_dialog_through_command('.uno:OptionsTreeDialog', close_button="") as xDialog: xPages = xDialog.getChild('pages') xGenEntry = xPages.getChild('0') xSecurityPage = xGenEntry.getChild('6') @@ -55,7 +55,7 @@ class tdf90401(UITestCase): xFilePath = os.path.join(tempdir, 'tdf90401-tmp.fodt') # Save Copy as - with self.ui_test.execute_dialog_through_command_guarded('.uno:SaveAs', close_button="open") as xDialog: + with self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="open") as xDialog: xFileName = xDialog.getChild('file_name') xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'CTRL+A'})) xFileName.executeAction('TYPE', mkPropertyValues({'KEYCODE':'BACKSPACE'})) |