[Libreoffice-commits] core.git: sd/qa uitest/uitest

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/data/embedded.pptx |binary
 sd/qa/uitest/impress_tests/embedded.py        |   39 ++++++++++++++++++++++++++
 uitest/uitest/test.py                         |    2 -
 3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 82010c9faad479d6aee5b69da717db49be9b5653
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Feb 10 12:59:21 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Feb 10 19:38:49 2021 +0100

    uitest: sd: check embedded document is open in a new dialog
    
    Change-Id: Ie2e9e7c9f97fba5f4bb8915098e61f86947197fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110702
    Tested-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sd/qa/uitest/impress_tests/data/embedded.pptx b/sd/qa/uitest/impress_tests/data/embedded.pptx
new file mode 100644
index 000000000000..956fda7e9150
Binary files /dev/null and b/sd/qa/uitest/impress_tests/data/embedded.pptx differ
diff --git a/sd/qa/uitest/impress_tests/embedded.py b/sd/qa/uitest/impress_tests/embedded.py
new file mode 100644
index 000000000000..ce7905d4b3fd
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/embedded.py
@@ -0,0 +1,39 @@
+# -*- 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 libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
+from libreoffice.calc.document import get_cell_by_position
+
+class EmbeddedDocument(UITestCase):
+
+  def test_open_embedded_document(self):
+    self.ui_test.load_file(get_url_for_data_file("embedded.pptx"))
+
+    xImpressDoc = self.xUITest.getTopFocusWindow()
+    xEditWin = xImpressDoc.getChild("impress_win")
+
+    xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Object 2"}))
+
+    def handle_embedded_document_dlg(dialog):
+        document = self.ui_test.get_component()
+        self.assertEqual("Name", get_cell_by_position(document, 0, 0, 0).getString())
+        self.assertEqual("NWell", get_cell_by_position(document, 0, 0, 1).getString())
+        self.assertEqual("PWell", get_cell_by_position(document, 0, 0, 2).getString())
+        self.assertEqual("Active", get_cell_by_position(document, 0, 0, 3).getString())
+        self.assertEqual("NoPoly", get_cell_by_position(document, 0, 0, 4).getString())
+        self.assertEqual("Poly", get_cell_by_position(document, 0, 0, 5).getString())
+        self.assertEqual("Sized", get_cell_by_position(document, 0, 0, 6).getString())
+
+        self.xUITest.executeCommand(".uno:CloseDoc")
+
+    self.ui_test.execute_blocking_action(xEditWin.executeAction, args=("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})),
+            dialog_handler=handle_embedded_document_dlg)
+
+    self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index a746643638bf..675d8eea4e03 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -208,7 +208,7 @@ class UITest(object):
         """
 
         thread = threading.Thread(target=action, args=args)
-        with EventListener(self._xContext, ["DialogExecute", "ModelessDialogExecute", "ModelessDialogVisible"], printNames=printNames) as event:
+        with EventListener(self._xContext, ["OnLoad", "DialogExecute", "ModelessDialogExecute", "ModelessDialogVisible"], printNames=printNames) as event:
             thread.start()
             time_ = 0
             # we are not necessarily opening a dialog, so wait much longer