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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/csv_dialog/tdf142395.py |    4 ++--
 sc/qa/uitest/csv_dialog/tdf60468.py  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 027b57c606685a6111e4b3e5f5c9f51281ef1bab
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Jun 25 00:35:31 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Jun 25 14:40:28 2021 +0200

    uitest: use wait_for_top_focus_window when opening the csv dialog
    
    Change-Id: I3d37383e5cd2cc949971e9df837f32b59970de59
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117800
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/qa/uitest/csv_dialog/tdf142395.py b/sc/qa/uitest/csv_dialog/tdf142395.py
index 874313afecf9..b1906c7295ec 100644
--- a/sc/qa/uitest/csv_dialog/tdf142395.py
+++ b/sc/qa/uitest/csv_dialog/tdf142395.py
@@ -23,12 +23,12 @@ class Tdf142395(UITestCase):
         xOpenBtn = xOpenDialog.getChild("open")
         xOpenBtn.executeAction("CLICK", tuple())
 
+        xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
         # Remove the text delimiter
-        xTextDelimiter = self.ui_test.wait_until_child_is_available('textdelimiter')
+        xTextDelimiter = xDialog.getChild("textdelimiter")
         xTextDelimiter.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
         xTextDelimiter.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 
-        xDialog = self.xUITest.getTopFocusWindow()
         xOK = xDialog.getChild('ok')
         with self.ui_test.wait_until_component_loaded():
             self.ui_test.close_dialog_through_button(xOK)
diff --git a/sc/qa/uitest/csv_dialog/tdf60468.py b/sc/qa/uitest/csv_dialog/tdf60468.py
index 48af292df505..77b4a0f37c6a 100644
--- a/sc/qa/uitest/csv_dialog/tdf60468.py
+++ b/sc/qa/uitest/csv_dialog/tdf60468.py
@@ -23,7 +23,7 @@ class Tdf60468(UITestCase):
         xOpenBtn = xOpenDialog.getChild("open")
         xOpenBtn.executeAction("CLICK", tuple())
 
-        xDialog = self.xUITest.getTopFocusWindow()
+        xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
         self.assertEqual('true', get_state_as_dict(xDialog.getChild("tab"))['Selected'])
         self.assertEqual('true', get_state_as_dict(xDialog.getChild("comma"))['Selected'])
         self.assertEqual('true', get_state_as_dict(xDialog.getChild("semicolon"))['Selected'])