summaryrefslogtreecommitdiff
path: root/uitest
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-07-10 18:21:51 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-07-13 11:29:56 +0200
commitbec5a2639636635c9184beda2f63fe4a9a16a9b8 (patch)
treeaa0e6eccea5c88206243951b9c37d93807f68589 /uitest
parentfd68096c6cc55ed0087517e0c60285e40efb92f5 (diff)
uitest: move more code into the new directory layout
Change-Id: Ic5d08f08c1fccc74be09cea7887d3acb910e7636
Diffstat (limited to 'uitest')
-rw-r--r--uitest/calc_tests/create_chart.py2
-rw-r--r--uitest/calc_tests/create_range_name.py2
-rw-r--r--uitest/calc_tests/function_wizard.py2
-rw-r--r--uitest/calc_tests/gridwin.py2
-rw-r--r--uitest/calc_tests/gridwindow.py2
-rw-r--r--uitest/demo_ui/char_dialog.py2
-rw-r--r--uitest/demo_ui/checkbox.py2
-rw-r--r--uitest/demo_ui/combobox.py2
-rw-r--r--uitest/demo_ui/edit.py2
-rw-r--r--uitest/demo_ui/gridwin.py2
-rw-r--r--uitest/demo_ui/listbox.py2
-rw-r--r--uitest/demo_ui/radiobutton.py2
-rw-r--r--uitest/demo_ui/spinfield.py2
-rw-r--r--uitest/demo_ui/tabcontrol.py2
-rw-r--r--uitest/demo_ui/tabdialog.py2
-rw-r--r--uitest/demo_ui/treelist.py2
-rw-r--r--uitest/impress_tests/start.py2
-rw-r--r--uitest/libreoffice/uno/propertyvalue.py (renamed from uitest/helper.py)0
-rw-r--r--uitest/uitest/uihelper/calc.py2
-rw-r--r--uitest/uitest_helper.py2
-rw-r--r--uitest/writer_tests/start.py2
21 files changed, 20 insertions, 20 deletions
diff --git a/uitest/calc_tests/create_chart.py b/uitest/calc_tests/create_chart.py
index 322618b82d46..356fcb268196 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/calc_tests/create_range_name.py b/uitest/calc_tests/create_range_name.py
index a265970bdb06..6c61d14694d9 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/uitest/calc_tests/create_range_name.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/calc_tests/function_wizard.py b/uitest/calc_tests/function_wizard.py
index b7ab11d25bc8..7c37a2c58fdb 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/uitest/calc_tests/function_wizard.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
import time
from uitest.framework import UITestCase
diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 3366dc0c5bdd..ba50baecfe5e 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index 7620df14a62e..7589467290b8 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/uitest/calc_tests/gridwindow.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.calc import enter_text_to_cell
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
index 06c17bb67cb1..933835237dfc 100644
--- a/uitest/demo_ui/char_dialog.py
+++ b/uitest/demo_ui/char_dialog.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
from uitest.debug import sleep
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index 718444ec6adc..9555206e6f10 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py
index 81c06ba02e6c..3fa42a2f6564 100644
--- a/uitest/demo_ui/combobox.py
+++ b/uitest/demo_ui/combobox.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index bb3b2ee41384..b5dda599d8a5 100644
--- a/uitest/demo_ui/edit.py
+++ b/uitest/demo_ui/edit.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/gridwin.py b/uitest/demo_ui/gridwin.py
index 60dfac53dd3c..d46506c2b69b 100644
--- a/uitest/demo_ui/gridwin.py
+++ b/uitest/demo_ui/gridwin.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index 487d476deba7..e2977469be63 100644
--- a/uitest/demo_ui/listbox.py
+++ b/uitest/demo_ui/listbox.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/radiobutton.py b/uitest/demo_ui/radiobutton.py
index 23d7aba85a48..0867085b4414 100644
--- a/uitest/demo_ui/radiobutton.py
+++ b/uitest/demo_ui/radiobutton.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index b581a0362e26..c9912b1cc518 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/uitest/demo_ui/spinfield.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest_helper import get_state_as_dict
import time
diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py
index cc04221ede74..196bcb805ed1 100644
--- a/uitest/demo_ui/tabcontrol.py
+++ b/uitest/demo_ui/tabcontrol.py
@@ -9,7 +9,7 @@ import time
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.calc import enter_text_to_cell
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index 0cbc4ec29430..ee57d3139c93 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
import time
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index ef5512a569d5..e708c45ab257 100644
--- a/uitest/demo_ui/treelist.py
+++ b/uitest/demo_ui/treelist.py
@@ -9,7 +9,7 @@ import time
from uitest_helper import UITest
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.calc import enter_text_to_cell
from uitest_helper import get_state_as_dict
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index 5657b69e895d..16b4a7d6a381 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest, get_state_as_dict
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
diff --git a/uitest/helper.py b/uitest/libreoffice/uno/propertyvalue.py
index b64c49b23072..b64c49b23072 100644
--- a/uitest/helper.py
+++ b/uitest/libreoffice/uno/propertyvalue.py
diff --git a/uitest/uitest/uihelper/calc.py b/uitest/uitest/uihelper/calc.py
index 66e85e146d5b..b63f1702873b 100644
--- a/uitest/uitest/uihelper/calc.py
+++ b/uitest/uitest/uihelper/calc.py
@@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
def enter_text_to_cell(gridwin, cell, text):
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": cell}))
diff --git a/uitest/uitest_helper.py b/uitest/uitest_helper.py
index 049929c8d024..a2efe6b011e1 100644
--- a/uitest/uitest_helper.py
+++ b/uitest/uitest_helper.py
@@ -9,7 +9,7 @@ import time
from libreoffice.uno.eventlistener import EventListener
-from helper import convert_property_values_to_dict
+from libreoffice.uno.propertyvalue import convert_property_values_to_dict
class DialogNotExecutedException(Exception):
def __init__(self, command):
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index 40aebcbb64ab..d5a68b84dfe9 100644
--- a/uitest/writer_tests/start.py
+++ b/uitest/writer_tests/start.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest, get_state_as_dict
-from helper import mkPropertyValues
+from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase