[Libreoffice-commits] core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests7/tdf90401.py |   38 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 9eaf09e363c2c1377f74aa0db4854be2f825dd23
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Sep 10 12:33:08 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Sep 10 14:31:22 2021 +0200

    uitest: sw: Close the modeless dialogs after using them
    
    Otherwise, they will remain open in the next test
    
    Change-Id: I0019a3d98b7a66d6c4ba15408047facc7093cb5a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121893
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py b/sw/qa/uitest/writer_tests7/tdf90401.py
index 4850a4cd108f..5ad22a21674d 100644
--- a/sw/qa/uitest/writer_tests7/tdf90401.py
+++ b/sw/qa/uitest/writer_tests7/tdf90401.py
@@ -82,16 +82,15 @@ class tdf90401(UITestCase):
                     self.assertEqual(year, 0)
 
                     # check removed personal info on tracked changes
-                    try:
-                        self.ui_test.execute_modeless_dialog_through_command('.uno:AcceptTrackedChanges')
-                        xTrackDlg = self.xUITest.getTopFocusWindow()
-                        xTreeList = xTrackDlg.getChild('writerchanges')
-                        state = get_state_as_dict(xTreeList)
-                        # This was 'NL\t11/03/2020 19:19:05\t', containing personal info
-                        self.assertEqual(state['SelectEntryText'], 'Author1\t01/01/1970 00:00:00\t')
-                    except:
-                        # skip the test for Clang's exception "Dialog not executed for..."
-                        pass
+                    self.ui_test.execute_modeless_dialog_through_command('.uno:AcceptTrackedChanges')
+                    xTrackDlg = self.xUITest.getTopFocusWindow()
+                    xTreeList = xTrackDlg.getChild('writerchanges')
+                    state = get_state_as_dict(xTreeList)
+                    # This was 'NL\t11/03/2020 19:19:05\t', containing personal info
+                    self.assertEqual(state['SelectEntryText'], 'Author1\t01/01/1970 00:00:00\t')
+
+                    xCloseBtn = xTrackDlg.getChild("close")
+                    xCloseBtn.executeAction("CLICK", tuple())
 
 
    def test_tdf142902_remove_personal_info_in_DOCX(self):
@@ -166,15 +165,14 @@ class tdf90401(UITestCase):
 
                     # check removed personal info on tracked changes
 
-                    try:
-                        self.ui_test.execute_modeless_dialog_through_command('.uno:AcceptTrackedChanges')
-                        xTrackDlg = self.xUITest.getTopFocusWindow()
-                        xTreeList = xTrackDlg.getChild('writerchanges')
-                        state = get_state_as_dict(xTreeList)
-                        # This was 'NL\t11/03/2020 19:19:05\t', containing personal info
-                        self.assertEqual(state['SelectEntryText'], 'Author1\t01/01/1970 00:00:00\t')
-                    except:
-                        # skip the test for Clang's exception "Dialog not executed for..."
-                        pass
+                    self.ui_test.execute_modeless_dialog_through_command('.uno:AcceptTrackedChanges')
+                    xTrackDlg = self.xUITest.getTopFocusWindow()
+                    xTreeList = xTrackDlg.getChild('writerchanges')
+                    state = get_state_as_dict(xTreeList)
+                    # This was 'NL\t11/03/2020 19:19:05\t', containing personal info
+                    self.assertEqual(state['SelectEntryText'], 'Author1\t01/01/1970 00:00:00\t')
+
+                    xCloseBtn = xTrackDlg.getChild("close")
+                    xCloseBtn.executeAction("CLICK", tuple())
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: