uitest: all files moved to the new directory layout

Change-Id: Ib5a6fc98fafb774ca5c7cc1323dbe4eb8a1c4aff

uitest/calc_tests/about_test.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from uitest.framework import UITestCase
 
 class AboutDlgTest(UITestCase):

uitest/calc_tests/create_chart.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/calc_tests/create_range_name.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/calc_tests/function_wizard.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/calc_tests/gridwin.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/calc_tests/gridwindow.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.uihelper.calc import enter_text_to_cell

uitest/demo_ui/char_dialog.py

@@ -5,9 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
+
 from uitest.framework import UITestCase
 
 from uitest.debug import sleep

uitest/demo_ui/checkbox.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/combobox.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/edit.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/gridwin.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/listbox.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/radiobutton.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/spinfield.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict
 

uitest/demo_ui/tabcontrol.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.uihelper.calc import enter_text_to_cell

uitest/demo_ui/tabdialog.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase

uitest/demo_ui/treelist.py

@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from uitest_helper import UITest
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.calc import enter_text_to_cell
 

uitest/uitest/config.py

@@ -7,4 +7,6 @@
 
 use_sleep = False
 
+DEFAULT_SLEEP = 0.1
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab: */

uitest/uitest/framework.py

@@ -8,7 +8,7 @@
 import unittest
 import time
 
-from uitest_helper import UITest
+from uitest.test import UITest
 
 from libreoffice.connection import PersistentConnection, OfficeConnection
 

uitest/uitest_helper.py → uitest/uitest/test.py

@@ -6,6 +6,7 @@
 #
 
 import time
+from uitest.config import DEFAULT_SLEEP
 
 from libreoffice.uno.eventlistener import EventListener
 
@@ -18,8 +19,6 @@ class DialogNotExecutedException(Exception):
 
 class UITest(object):
 
-    DEFAULT_SLEEP = 0.1
-
     def __init__(self, xUITest, xContext):
         self._xUITest = xUITest
         self._xContext = xContext
@@ -30,10 +29,10 @@ class UITest(object):
             time_ = 0
             while time_ < 30:
                 if event.executed:
-                    time.sleep(self.DEFAULT_SLEEP)
+                    time.sleep(DEFAULT_SLEEP)
                     return
-                time_ += self.DEFAULT_SLEEP
-                time.sleep(self.DEFAULT_SLEEP)
+                time_ += DEFAULT_SLEEP
+                time.sleep(DEFAULT_SLEEP)
 
         raise DialogNotExecutedException(command)
 
@@ -43,10 +42,10 @@ class UITest(object):
             time_ = 0
             while time_ < 30:
                 if event.executed:
-                    time.sleep(self.DEFAULT_SLEEP)
+                    time.sleep(DEFAULT_SLEEP)
                     return
-                time_ += self.DEFAULT_SLEEP
-                time.sleep(self.DEFAULT_SLEEP)
+                time_ += DEFAULT_SLEEP
+                time.sleep(DEFAULT_SLEEP)
 
         raise DialogNotExecutedException(command)
 
@@ -59,8 +58,8 @@ class UITest(object):
             while time_ < 30:
                 if event.executed:
                     return
-                time_ += self.DEFAULT_SLEEP
-                time.sleep(self.DEFAULT_SLEEP)
+                time_ += DEFAULT_SLEEP
+                time.sleep(DEFAULT_SLEEP)
 
         print("failure doc in start center")
 
@@ -79,7 +78,7 @@ class UITest(object):
                 elif event.hasExecuted("OnViewClosed"):
                     return
 
-                time_ += self.DEFAULT_SLEEP
-                time.sleep(self.DEFAULT_SLEEP)
+                time_ += DEFAULT_SLEEP
+                time.sleep(DEFAULT_SLEEP)
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: */