summaryrefslogtreecommitdiff
path: root/sc/qa/uitest/chart
diff options
context:
space:
mode:
Diffstat (limited to 'sc/qa/uitest/chart')
-rw-r--r--sc/qa/uitest/chart/copyPaste.py2
-rw-r--r--sc/qa/uitest/chart/create_chart.py12
-rw-r--r--sc/qa/uitest/chart/edit_chart.py2
-rw-r--r--sc/qa/uitest/chart/tdf101894.py4
-rw-r--r--sc/qa/uitest/chart/tdf124295.py2
-rw-r--r--sc/qa/uitest/chart/tdf131715.py2
-rw-r--r--sc/qa/uitest/chart/tdf43175.py2
-rw-r--r--sc/qa/uitest/chart/tdf46885.py4
-rw-r--r--sc/qa/uitest/chart/tdf62349.py2
-rw-r--r--sc/qa/uitest/chart/tdf99069.py2
10 files changed, 17 insertions, 17 deletions
diff --git a/sc/qa/uitest/chart/copyPaste.py b/sc/qa/uitest/chart/copyPaste.py
index bef17145690a..e2d8fe0349e2 100644
--- a/sc/qa/uitest/chart/copyPaste.py
+++ b/sc/qa/uitest/chart/copyPaste.py
@@ -39,7 +39,7 @@ class CopyPaste(UITestCase):
with self.ui_test.load_empty_file("calc") as calc_document:
# Rename the sheet to match the same name as the first document
- with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+ with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
xname_entry = xDialog.getChild("name_entry")
xname_entry.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
diff --git a/sc/qa/uitest/chart/create_chart.py b/sc/qa/uitest/chart/create_chart.py
index 42f8211a8e83..878af422a581 100644
--- a/sc/qa/uitest/chart/create_chart.py
+++ b/sc/qa/uitest/chart/create_chart.py
@@ -34,7 +34,7 @@ class CalcChartUIDemo(UITestCase):
self.fill_spreadsheet()
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel"):
pass
self.ui_test.close_doc()
@@ -45,7 +45,7 @@ class CalcChartUIDemo(UITestCase):
self.fill_spreadsheet()
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
self.ui_test.close_doc()
@@ -56,7 +56,7 @@ class CalcChartUIDemo(UITestCase):
self.fill_spreadsheet()
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
xNextBtn = xChartDlg.getChild("next")
xNextBtn.executeAction("CLICK", tuple())
@@ -76,7 +76,7 @@ class CalcChartUIDemo(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
@@ -94,7 +94,7 @@ class CalcChartUIDemo(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
@@ -115,7 +115,7 @@ class CalcChartUIDemo(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
diff --git a/sc/qa/uitest/chart/edit_chart.py b/sc/qa/uitest/chart/edit_chart.py
index 4c9bb50c25ea..48d9149004f5 100644
--- a/sc/qa/uitest/chart/edit_chart.py
+++ b/sc/qa/uitest/chart/edit_chart.py
@@ -36,7 +36,7 @@ class CalcChartEditUIDemo(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
xGridWindow.executeAction("DESELECT", mkPropertyValues({"OBJECT": ""}))
diff --git a/sc/qa/uitest/chart/tdf101894.py b/sc/qa/uitest/chart/tdf101894.py
index 66dcf1fbc483..9737d41046e1 100644
--- a/sc/qa/uitest/chart/tdf101894.py
+++ b/sc/qa/uitest/chart/tdf101894.py
@@ -34,7 +34,7 @@ class tdf101894(UITestCase):
xOldSheetRanges.append(xRow)
# Rename the sheet first
- with self.ui_test.execute_dialog_through_command_guarded(".uno:RenameTable") as xDialog:
+ with self.ui_test.execute_dialog_through_command(".uno:RenameTable") as xDialog:
xname_entry = xDialog.getChild("name_entry")
oldName = get_state_as_dict(xname_entry)['Text']
@@ -43,7 +43,7 @@ class tdf101894(UITestCase):
xname_entry.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"}))
# Copy sheet and use the old name
- with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+ with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
newName = xDialog.getChild("newName")
newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
newName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
diff --git a/sc/qa/uitest/chart/tdf124295.py b/sc/qa/uitest/chart/tdf124295.py
index f4f75e42c6f3..131f897c9573 100644
--- a/sc/qa/uitest/chart/tdf124295.py
+++ b/sc/qa/uitest/chart/tdf124295.py
@@ -16,7 +16,7 @@ class tdf124295(UITestCase):
def test_tdf124295(self):
# Open spreadsheet and insert chart
self.ui_test.create_doc_in_start_center("calc")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="cancel") as xChartDlg:
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="cancel") as xChartDlg:
# Click 3D look check button
x3DCheckBtn = xChartDlg.getChild("3dlook")
diff --git a/sc/qa/uitest/chart/tdf131715.py b/sc/qa/uitest/chart/tdf131715.py
index 11c4ae42fd2c..d8954d9cfab6 100644
--- a/sc/qa/uitest/chart/tdf131715.py
+++ b/sc/qa/uitest/chart/tdf131715.py
@@ -11,7 +11,7 @@ class tdf131715(UITestCase):
def test_tdf131715(self):
self.ui_test.create_doc_in_start_center("calc")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
xWizard = xChartDlg.getChild('Wizard')
diff --git a/sc/qa/uitest/chart/tdf43175.py b/sc/qa/uitest/chart/tdf43175.py
index cc3b24e8b778..08ad67b2211d 100644
--- a/sc/qa/uitest/chart/tdf43175.py
+++ b/sc/qa/uitest/chart/tdf43175.py
@@ -15,7 +15,7 @@ class Tdf43175(UITestCase):
self.xUITest.executeCommand(".uno:TableSelectAll")
- with self.ui_test.execute_dialog_through_command_guarded(".uno:Move") as xDialog:
+ with self.ui_test.execute_dialog_through_command(".uno:Move") as xDialog:
insertBefore = xDialog.getChild("insertBefore")
# Select - move to end position -
diff --git a/sc/qa/uitest/chart/tdf46885.py b/sc/qa/uitest/chart/tdf46885.py
index 6f95ab9636bb..637033505fd3 100644
--- a/sc/qa/uitest/chart/tdf46885.py
+++ b/sc/qa/uitest/chart/tdf46885.py
@@ -21,7 +21,7 @@ class tdf46885(UITestCase):
document = self.ui_test.get_component()
enter_text_to_cell(gridwin, "A10", "col1")
#When you start a new chart and have one empty cell selected LibO will crash when you select the Next>> button.
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
xNextBtn = xChartDlg.getChild("next")
xNextBtn.executeAction("CLICK", tuple())
@@ -38,7 +38,7 @@ class tdf46885(UITestCase):
enter_text_to_cell(gridwin, "A10", "col1")
#If you select multiple empty cells and then start a new chart LibO will crash immediately.
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C4"}))
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg:
xNextBtn = xChartDlg.getChild("next")
xNextBtn.executeAction("CLICK", tuple())
diff --git a/sc/qa/uitest/chart/tdf62349.py b/sc/qa/uitest/chart/tdf62349.py
index cf5d231bbba5..8cc3e6b9c741 100644
--- a/sc/qa/uitest/chart/tdf62349.py
+++ b/sc/qa/uitest/chart/tdf62349.py
@@ -21,7 +21,7 @@ class tdf62349(UITestCase):
#3: select all data cells C5:H9
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C5:H9"}))
# 4: create a chart with insert/chart menu
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
pass
# 5: (single) click to an empty cell to finalize the chart
diff --git a/sc/qa/uitest/chart/tdf99069.py b/sc/qa/uitest/chart/tdf99069.py
index c6eec4d035e7..67d1ca86f845 100644
--- a/sc/qa/uitest/chart/tdf99069.py
+++ b/sc/qa/uitest/chart/tdf99069.py
@@ -20,7 +20,7 @@ class tdf99069(UITestCase):
gridwin = xCalcDoc.getChild("grid_window")
#(1) Download and open example.ods attached to tdf#97266 with cell B1 active.
#(2) In tool bar, click the chart icon. Program presents Chart Wizard.
- with self.ui_test.execute_dialog_through_command_guarded(".uno:InsertObjectChart", close_button="finish"):
+ with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish"):
# the chart shows a border with handles on each side and at each corner.
pass