summaryrefslogtreecommitdiff
path: root/sw/qa/uitest/writer_tests4
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa/uitest/writer_tests4')
-rw-r--r--sw/qa/uitest/writer_tests4/insertBreakDialog.py8
-rw-r--r--sw/qa/uitest/writer_tests4/insertPageHeader.py4
-rw-r--r--sw/qa/uitest/writer_tests4/tdf113252.py2
-rw-r--r--sw/qa/uitest/writer_tests4/tdf113284.py4
-rw-r--r--sw/qa/uitest/writer_tests4/tdf115572.py8
-rw-r--r--sw/qa/uitest/writer_tests4/tdf115573.py16
-rw-r--r--sw/qa/uitest/writer_tests4/tdf122449.py4
-rw-r--r--sw/qa/uitest/writer_tests4/tdf138546.py4
-rw-r--r--sw/qa/uitest/writer_tests4/tdf51352.py6
9 files changed, 28 insertions, 28 deletions
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
generated by cgit (git 2.34.1) at 2025-01-12 05:05:19 +0000