diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-07-19 11:04:04 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-07-19 15:53:43 +0200 |
| commit | 5b3c530016927d3e91e3124e124f7b428ab285ac (patch) | |
| tree | 8180467ef28ef6973b0f56372f2843fef9721a18 /sd | |
| parent | 7cd43c743cb96ed6305f05e26a6c4bfb0bf87f4d (diff) | |
uitest: sd: put similar tests in the same file
Besides, self.ui_test.close_doc() is already called within
the create_doc_in_start_center context manager
Change-Id: Ic5bb4cfa55fb3892172a073a1f40b8e916802c0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119167
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/uitest/impress_tests/customSlideShow.py | 10 | ||||
| -rw-r--r-- | sd/qa/uitest/impress_tests/customSlideShowDialog.py | 21 |
2 files changed, 9 insertions, 22 deletions
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py b/sd/qa/uitest/impress_tests/customSlideShow.py index 403281bf4c62..4915dce68800 100644 --- a/sd/qa/uitest/impress_tests/customSlideShow.py +++ b/sd/qa/uitest/impress_tests/customSlideShow.py @@ -57,6 +57,14 @@ class customSlideShow(UITestCase): # delete.executeAction("CLICK",tuple()) # self.assertEqual(get_state_as_dict(customshowlist)["Children"], "0") - + def test_tdf143125(self): + with self.ui_test.create_doc_in_start_center("impress"): + MainWindow = self.xUITest.getTopFocusWindow() + TemplateDialog = self.xUITest.getTopFocusWindow() + cancel = TemplateDialog.getChild("close") + self.ui_test.close_dialog_through_button(cancel) + with self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog") as CustomSlideShows: + # Without the fix in place, this test would have crashed here + pass # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sd/qa/uitest/impress_tests/customSlideShowDialog.py b/sd/qa/uitest/impress_tests/customSlideShowDialog.py deleted file mode 100644 index b515a9657f85..000000000000 --- a/sd/qa/uitest/impress_tests/customSlideShowDialog.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- - -from uitest.framework import UITestCase -from libreoffice.uno.propertyvalue import mkPropertyValues -import importlib -from uitest.debug import sleep -from uitest.uihelper.common import select_pos -from uitest.uihelper.common import get_state_as_dict, type_text - -class customSlideShowDialog(UITestCase): - def test_customSlideShowDialog(self): - with self.ui_test.create_doc_in_start_center("impress"): - MainWindow = self.xUITest.getTopFocusWindow() - TemplateDialog = self.xUITest.getTopFocusWindow() - cancel = TemplateDialog.getChild("close") - self.ui_test.close_dialog_through_button(cancel) - with self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog") as CustomSlideShows: - self.ui_test.close_doc() - # Without the fix in place, this test would have crashed here - -# vim: set shiftwidth=4 softtabstop=4 expandtab: |