uitest: move more parts to the new directory structure

Change-Id: I9dab4c0beef08b04e65dc0dae337a822041cf218

uitest/demo_ui/spinfield.py

@@ -8,7 +8,7 @@
 from uitest_helper import UITest
 
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest_helper import get_state_as_dict
+from uitest.uihelper.common import get_state_as_dict
 
 from uitest.framework import UITestCase
 

uitest/demo_ui/treelist.py

@@ -10,7 +10,7 @@ from uitest_helper import UITest
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.calc import enter_text_to_cell
 
-from uitest_helper import get_state_as_dict
+from uitest.uihelper.common import get_state_as_dict
 
 from uitest.framework import UITestCase
 

uitest/impress_tests/start.py

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

uitest/uitest/uihelper/common.py

+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-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 libreoffice.uno.propertyvalue import convert_property_values_to_dict
+
+def get_state_as_dict(ui_object):
+    return convert_property_values_to_dict(ui_object.getState())
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: */

uitest/uitest_helper.py

@@ -9,8 +9,6 @@ import time
 
 from libreoffice.uno.eventlistener import EventListener
 
-from libreoffice.uno.propertyvalue import convert_property_values_to_dict
-
 class DialogNotExecutedException(Exception):
     def __init__(self, command):
         self.command = command
@@ -84,7 +82,4 @@ class UITest(object):
                 time_ += self.DEFAULT_SLEEP
                 time.sleep(self.DEFAULT_SLEEP)
 
-def get_state_as_dict(ui_object):
-    return convert_property_values_to_dict(ui_object.getState())
-
 # vim:set shiftwidth=4 softtabstop=4 expandtab: */

uitest/writer_tests/start.py

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