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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/chapterNumbering/tdf140528.py |   60 +++++++++++++++++++++++++++++
 vcl/source/uitest/uiobject.cxx             |    1 
 2 files changed, 61 insertions(+)

New commits:
commit 7def8c3cd8a1d9b4df2478210055b06382e6d493
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Mar 1 11:57:52 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Mar 1 19:52:12 2021 +0100

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

diff --git a/sw/qa/uitest/chapterNumbering/tdf140528.py b/sw/qa/uitest/chapterNumbering/tdf140528.py
new file mode 100644
index 000000000000..9b60ad9991a0
--- /dev/null
+++ b/sw/qa/uitest/chapterNumbering/tdf140528.py
@@ -0,0 +1,60 @@
+# -*- 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_state_as_dict
+from uitest.uihelper.common import select_pos
+
+class Tdf140528(UITestCase):
+
+    def test_tdf140528(self):
+        self.ui_test.create_doc_in_start_center("writer")
+        document = self.ui_test.get_component()
+
+        self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog")
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        xTab = xDialog.getChild("tabcontrol")
+        select_pos(xTab, "0")
+
+        xFormat = xDialog.getChild("format")
+
+        def handle_format_dlg(dialog):
+            xEntry = dialog.getChild("entry")
+            self.assertEqual("Untitled 1", get_state_as_dict(xEntry)['Text'])
+
+            xEntry.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+            xEntry.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+            xEntry.executeAction("TYPE", mkPropertyValues({"TEXT" : "newFormat"}))
+
+            xOKBtn = dialog.getChild("ok")
+            self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.ui_test.execute_blocking_action(xFormat.executeAction, args=('OPENFROMLIST', mkPropertyValues({"POS": "10"})),
+                dialog_handler=handle_format_dlg)
+
+        self.assertEqual("saveas", get_state_as_dict(xFormat)['CurrentItem'])
+
+        # Go to Position tab
+        select_pos(xTab, "1")
+
+        # Go back to Numbering tab
+        select_pos(xTab, "0")
+
+        xFormat.executeAction('OPENFROMLIST', mkPropertyValues({"POS": "0"}))
+        self.assertEqual("form1", get_state_as_dict(xFormat)['CurrentItem'])
+
+        # Without the fix in place, this test would have crashed here
+        select_pos(xTab, "1")
+
+        xOKBtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index be619a77d53d..1e023fc9ca0c 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -1676,6 +1676,7 @@ StringMap MenuButtonUIObject::get_state()
 {
     StringMap aMap = WindowUIObject::get_state();
     aMap["Label"] = mxMenuButton->GetDisplayText();
+    aMap["CurrentItem"] = OUString::createFromAscii(mxMenuButton->GetCurItemIdent());
     return aMap;
 }