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

[Libreoffice Gerrit user]

 sw/qa/uitest/findReplace/tdf118208.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 7ef1b589b15473f87fbbaff57aa2518fffed4082
Author:     Zdeněk Crhonek <zcrhonek at gmail.com>
AuthorDate: Mon Nov 12 23:07:21 2018 +0100
Commit:     Zdenek Crhonek <zcrhonek at gmail.com>
CommitDate: Tue Nov 13 19:37:20 2018 +0100

    uitest cleaning
    
    Change-Id: Idea5a87b7cce40c23eada06be82524c9b45a4db5
    Reviewed-on: https://gerrit.libreoffice.org/63313
    Tested-by: Jenkins
    Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>

diff --git a/sw/qa/uitest/findReplace/tdf118208.py b/sw/qa/uitest/findReplace/tdf118208.py
index ae866b30addd..b55fe5231574 100644
--- a/sw/qa/uitest/findReplace/tdf118208.py
+++ b/sw/qa/uitest/findReplace/tdf118208.py
@@ -12,12 +12,11 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 from uitest.debug import sleep
-#import org.libreoffice.unotest
-#import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
+
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 #Find and replace
 #tdf118208/118212 - enabling either CJK or CTL, or both (Tools -> Options -> Language Settings -> Languages: Default Languages for Documents checkboxes)
@@ -49,7 +48,7 @@ class tdf118208(UITestCase):
             asianlanguage.executeAction("CLICK", tuple())
         if (get_state_as_dict(complexlanguage)["Selected"]) == "true":
             complexlanguage.executeAction("CLICK", tuple())
-        sleep(5)
+
         xOKBtn = xDialog.getChild("ok")
         self.ui_test.close_dialog_through_button(xOKBtn)
 
@@ -58,7 +57,6 @@ class tdf118208(UITestCase):
 
         format = xDialog.getChild("format")
         def handle_format_dlg(dialog):
-            sleep(3)
             xOkBtn = dialog.getChild("ok")
             self.ui_test.close_dialog_through_button(xOkBtn)
 
@@ -86,7 +84,6 @@ class tdf118208(UITestCase):
             asianlanguage.executeAction("CLICK", tuple())
         if (get_state_as_dict(complexlanguage)["Selected"]) == "false":
             complexlanguage.executeAction("CLICK", tuple())
-        sleep(5)
         xOKBtn = xDialog.getChild("ok")
         self.ui_test.close_dialog_through_button(xOKBtn)