diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-30 11:57:03 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-30 13:18:38 +0200 |
commit | 3874e092da4acbaa076d885444f26f014fd781b5 (patch) | |
tree | 8342124c5325ad188f9b4be87052c4a884af560e /svx | |
parent | 57e8d25a40d7c053fef8ecb452e159264c659604 (diff) |
uitest: guard the remaining create_doc_in_start_center
Mostly done by a script
for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac
< UITest: introduce guarded context managers >
Change-Id: I2a6149b318d1fdaa36efe5d65af4c238827eaaf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118154
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/qa/uitest/table/tablecontroller.py | 101 |
1 files changed, 49 insertions, 52 deletions
diff --git a/svx/qa/uitest/table/tablecontroller.py b/svx/qa/uitest/table/tablecontroller.py index 20a88ddf8268..c3e8691c40de 100644 --- a/svx/qa/uitest/table/tablecontroller.py +++ b/svx/qa/uitest/table/tablecontroller.py @@ -14,66 +14,63 @@ class SvxTableControllerTest(UITestCase): def testOnFormatTable(self): # Create an Impress document with a single table in it. - self.ui_test.create_doc_in_start_center("impress") - template = self.xUITest.getTopFocusWindow() - self.ui_test.close_dialog_through_button(template.getChild("close")) - self.xUITest.executeCommand(".uno:SelectAll") - self.xUITest.executeCommand(".uno:Delete") - self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2") + with self.ui_test.create_doc_in_start_center_guarded("impress") as component: + template = self.xUITest.getTopFocusWindow() + self.ui_test.close_dialog_through_button(template.getChild("close")) + self.xUITest.executeCommand(".uno:SelectAll") + self.xUITest.executeCommand(".uno:Delete") + self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2") - # Enable shadow. - with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog: - tabs = tableDialog.getChild("tabcontrol") - # Select "shadow". - select_pos(tabs, "4") - shadowCheckbox = tableDialog.getChild("TSB_SHOW_SHADOW") - shadowCheckbox.executeAction("CLICK", tuple()) + # Enable shadow. + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog: + tabs = tableDialog.getChild("tabcontrol") + # Select "shadow". + select_pos(tabs, "4") + shadowCheckbox = tableDialog.getChild("TSB_SHOW_SHADOW") + shadowCheckbox.executeAction("CLICK", tuple()) - # Check if the shadow was enabled. - component = self.ui_test.get_component() - drawPage = component.getDrawPages().getByIndex(0) - shape = drawPage.getByIndex(0) - # Without the accompanying fix in place, this test would have failed with: - # AssertionError: False != True - # i.e. the table still had no shadow. - self.assertEqual(shape.Shadow, True) + # Check if the shadow was enabled. + drawPage = component.getDrawPages().getByIndex(0) + shape = drawPage.getByIndex(0) + # Without the accompanying fix in place, this test would have failed with: + # AssertionError: False != True + # i.e. the table still had no shadow. + self.assertEqual(shape.Shadow, True) - # Close the document. - self.ui_test.close_doc() + # Close the document. def testUndoCrash(self): # Given an Impress document with a single table in it: - self.ui_test.create_doc_in_start_center("impress") - template = self.xUITest.getTopFocusWindow() - self.ui_test.close_dialog_through_button(template.getChild("close")) - self.xUITest.executeCommand(".uno:SelectAll") - self.xUITest.executeCommand(".uno:Delete") - self.xUITest.executeCommand(".uno:InsertTable?Columns:short=3&Rows:short=3") - self.xUITest.executeCommand(".uno:SelectAll") + with self.ui_test.create_doc_in_start_center_guarded("impress"): + template = self.xUITest.getTopFocusWindow() + self.ui_test.close_dialog_through_button(template.getChild("close")) + self.xUITest.executeCommand(".uno:SelectAll") + self.xUITest.executeCommand(".uno:Delete") + self.xUITest.executeCommand(".uno:InsertTable?Columns:short=3&Rows:short=3") + self.xUITest.executeCommand(".uno:SelectAll") - # When enabling shadow on the shape while text edit is active: - doc = self.xUITest.getTopFocusWindow() - impress = doc.getChild("impress_win") - impress.executeAction("TYPE", mkPropertyValues({"TEXT": "A1"})) - for i in range(6): - impress.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+TAB"})) - impress.executeAction("TYPE", mkPropertyValues({"TEXT": "A3"})) - self.xUITest.executeCommand(".uno:SelectAll") - with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog: - tabs = tableDialog.getChild("tabcontrol") - # Select "shadow". - select_pos(tabs, "4") - shadowCheckbox = tableDialog.getChild("TSB_SHOW_SHADOW") - shadowCheckbox.executeAction("CLICK", tuple()) + # When enabling shadow on the shape while text edit is active: + doc = self.xUITest.getTopFocusWindow() + impress = doc.getChild("impress_win") + impress.executeAction("TYPE", mkPropertyValues({"TEXT": "A1"})) + for i in range(6): + impress.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+TAB"})) + impress.executeAction("TYPE", mkPropertyValues({"TEXT": "A3"})) + self.xUITest.executeCommand(".uno:SelectAll") + with self.ui_test.execute_dialog_through_command(".uno:TableDialog") as tableDialog: + tabs = tableDialog.getChild("tabcontrol") + # Select "shadow". + select_pos(tabs, "4") + shadowCheckbox = tableDialog.getChild("TSB_SHOW_SHADOW") + shadowCheckbox.executeAction("CLICK", tuple()) - # Then make sure we don't crash: - # Without the accompanying fix in place, this test would have failed crashed due to a - # use-after-free: text edit ended but an undo action of the text edit remained on the undo - # stack. - for i in range(2): - self.xUITest.executeCommand(".uno:Undo") + # Then make sure we don't crash: + # Without the accompanying fix in place, this test would have failed crashed due to a + # use-after-free: text edit ended but an undo action of the text edit remained on the undo + # stack. + for i in range(2): + self.xUITest.executeCommand(".uno:Undo") - # Close the document. - self.ui_test.close_doc() + # Close the document. # vim: set shiftwidth=4 softtabstop=4 expandtab: |