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

[Mike Kaganski (via logerrit)]

 sw/qa/uitest/findBar/tdf136941.py |    3 +++
 vcl/source/uitest/uiobject.cxx    |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 01ff7460b83da265a0c68fa01cf2282f4e7dd72e
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jun 4 15:27:56 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jun 4 16:34:57 2021 +0200

    Fix UITest
    
    It needs to wait until vnd.sun.star.findbar:FocusToFindbar does its
    magic, which was racing with Python executing its typing.
    
    This adds "SelectedText" property to ComboBoxUIObject::get_state.
    
    Change-Id: I30faab2cc36a3cde59cf72ae5a383738a3ad4738
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116694
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins

diff --git a/sw/qa/uitest/findBar/tdf136941.py b/sw/qa/uitest/findBar/tdf136941.py
index ab94449aefed..c77a7e2a2277 100644
--- a/sw/qa/uitest/findBar/tdf136941.py
+++ b/sw/qa/uitest/findBar/tdf136941.py
@@ -40,6 +40,9 @@ class tdf136941(UITestCase):
         self.xUITest.executeCommand("vnd.sun.star.findbar:FocusToFindbar")
 
         xfind = xWriterDoc.getChild("find")
+        self.ui_test.wait_until_property_is_updated(xfind, 'SelectedText', "Hello")
+        self.assertEqual("Hello", get_state_as_dict(xfind)['SelectedText'])
+
         xfind.executeAction("TYPE", mkPropertyValues({"TEXT": "World"}))
 
         # Without the fix in place, this test would have failed with
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 41636684803b..6c14c2192177 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -1176,6 +1176,7 @@ void ComboBoxUIObject::execute(const OUString& rAction,
 StringMap ComboBoxUIObject::get_state()
 {
     StringMap aMap = WindowUIObject::get_state();
+    aMap["SelectedText"] = mxComboBox->GetSelected();
     return aMap;
 }