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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_dialogs/openDialogs.py   |    1 
 sw/qa/uitest/writer_tests/data/tdf134243.odt |binary
 sw/qa/uitest/writer_tests7/tdf134243.py      |   29 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)

New commits:
commit 9b0a0bcc7ef3ae7a127e7d43b001bdb578184949
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jun 24 14:02:13 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 30 13:05:34 2020 +0200

    tdf#134243: sw: Add UItest
    
    Change-Id: I59376419048ddddff3e4fbbd6d3eb7436ee87747
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97029
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py b/sw/qa/uitest/writer_dialogs/openDialogs.py
index 60e126780d69..9e4ed0d85f4a 100644
--- a/sw/qa/uitest/writer_dialogs/openDialogs.py
+++ b/sw/qa/uitest/writer_dialogs/openDialogs.py
@@ -101,6 +101,7 @@ dialogs = [
     {"command": ".uno:FootnoteDialog", "closeButton": "cancel"},
     # {"command": ".uno:MailMergeWizard", "closeButton": "cancel"},
         # may hang forever in e_book_client_connect_direct_sync
+        # tested in sw/qa/uitest/writer_tests7/tdf134243.py
     {"command": ".uno:AddressBookSource", "closeButton": "cancel"},
     {"command": ".uno:RunMacro", "closeButton": "cancel"},
     {"command": ".uno:ScriptOrganizer", "closeButton": "close"},
diff --git a/sw/qa/uitest/writer_tests/data/tdf134243.odt b/sw/qa/uitest/writer_tests/data/tdf134243.odt
new file mode 100644
index 000000000000..28732b337423
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/tdf134243.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf134243.py b/sw/qa/uitest/writer_tests7/tdf134243.py
new file mode 100644
index 000000000000..49faa4bbb1bd
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf134243.py
@@ -0,0 +1,29 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.path import get_srcdir_url
+
+def get_url_for_data_file(file_name):
+    return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+
+class tdf134243(UITestCase):
+
+    def test_tdf134243(self):
+        writer_doc = self.ui_test.load_file(get_url_for_data_file("tdf134243.odt"))
+
+        # Without the fix in place, it would hung launching the mailmerge wizard
+        self.ui_test.execute_dialog_through_command(".uno:MailMergeWizard")
+
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        xCancelBtn = xDialog.getChild("cancel")
+        self.ui_test.close_dialog_through_button(xCancelBtn)
+
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
+