uitest: bring some order into the file mess
The uitest/uitest directory will be used for the actual uitest
framework.
The libreoffice directory should contain any common LibreOffice related
code.
Change-Id: I3f6394ff4be83b89a8764eab10a154e755237d35
diff --git a/uitest/calc_tests/about_test.py b/uitest/calc_tests/about_test.py
index df90e7d..1495837 100644
--- a/uitest/calc_tests/about_test.py
+++ b/uitest/calc_tests/about_test.py
@@ -7,7 +7,7 @@
from uitest_helper import UITest
from UITestCase import UITestCase
from uitest.framework import UITestCase
class AboutDlgTest(UITestCase):
diff --git a/uitest/calc_tests/create_chart.py b/uitest/calc_tests/create_chart.py
index 1bd8276..322618b 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/calc_tests/create_range_name.py b/uitest/calc_tests/create_range_name.py
index 01d01fd..a265970 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/uitest/calc_tests/create_range_name.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/calc_tests/function_wizard.py b/uitest/calc_tests/function_wizard.py
index bbdb0c1..b7ab11d 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/uitest/calc_tests/function_wizard.py
@@ -10,7 +10,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
import time
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 7077f4b..3366dc0 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index c3b2d1d..4dfa83a 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/uitest/calc_tests/gridwindow.py
@@ -11,7 +11,7 @@ from helper import mkPropertyValues
from uihelper.calc import enter_text_to_cell
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
index 0cf545f..903b2b1 100644
--- a/uitest/demo_ui/char_dialog.py
+++ b/uitest/demo_ui/char_dialog.py
@@ -8,7 +8,7 @@
from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index a15d686..718444e 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py
index b33644b..81c06ba 100644
--- a/uitest/demo_ui/combobox.py
+++ b/uitest/demo_ui/combobox.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
class ComboBoxTest(UITestCase):
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index 8ddbb1c5..bb3b2ee 100644
--- a/uitest/demo_ui/edit.py
+++ b/uitest/demo_ui/edit.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/demo_ui/gridwin.py b/uitest/demo_ui/gridwin.py
index 5c2fae90..60dfac5 100644
--- a/uitest/demo_ui/gridwin.py
+++ b/uitest/demo_ui/gridwin.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index f6857c2..487d476 100644
--- a/uitest/demo_ui/listbox.py
+++ b/uitest/demo_ui/listbox.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
class ListBoxTest(UITestCase):
diff --git a/uitest/demo_ui/radiobutton.py b/uitest/demo_ui/radiobutton.py
index fef71f5..23d7aba 100644
--- a/uitest/demo_ui/radiobutton.py
+++ b/uitest/demo_ui/radiobutton.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index 761c9ac..b581a03 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/uitest/demo_ui/spinfield.py
@@ -12,7 +12,7 @@ from uitest_helper import get_state_as_dict
import time
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py
index 1f5712d..222a423 100644
--- a/uitest/demo_ui/tabcontrol.py
+++ b/uitest/demo_ui/tabcontrol.py
@@ -13,7 +13,7 @@ from helper import mkPropertyValues
from uihelper.calc import enter_text_to_cell
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index 99e7b9f..0cbc4ec 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -11,7 +11,7 @@ from helper import mkPropertyValues
import time
from UITestCase import UITestCase
from uitest.framework import UITestCase
class TabDialogTest(UITestCase):
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index 23c1199..3814344 100644
--- a/uitest/demo_ui/treelist.py
+++ b/uitest/demo_ui/treelist.py
@@ -14,7 +14,7 @@ from uihelper.calc import enter_text_to_cell
from uitest_helper import get_state_as_dict
from UITestCase import UITestCase
from uitest.framework import UITestCase
try:
import pyuno
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index f82eb63..2de7482 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest, get_state_as_dict
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
diff --git a/uitest/connection.py b/uitest/libreoffice/connection.py
similarity index 100%
rename from uitest/connection.py
rename to uitest/libreoffice/connection.py
diff --git a/uitest/test_main.py b/uitest/test_main.py
index 4939d05..c755336851 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -13,9 +13,9 @@ import calc_tests
import importlib
import importlib.machinery
from UITestCase import UITestCase
from uitest.framework import UITestCase
from connection import PersistentConnection, OfficeConnection
from libreoffice.connection import OfficeConnection
def parseArgs(argv):
(optlist,args) = getopt.getopt(argv[1:], "hr",
diff --git a/uitest/UITestCase.py b/uitest/uitest/framework.py
similarity index 93%
rename from uitest/UITestCase.py
rename to uitest/uitest/framework.py
index 5e08804..a6f804b 100644
--- a/uitest/UITestCase.py
+++ b/uitest/uitest/framework.py
@@ -10,7 +10,7 @@ import time
from uitest_helper import UITest
from connection import PersistentConnection, OfficeConnection
from libreoffice.connection import PersistentConnection, OfficeConnection
class UITestCase(unittest.TestCase):
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index 13d99c9..40aebcb 100644
--- a/uitest/writer_tests/start.py
+++ b/uitest/writer_tests/start.py
@@ -9,7 +9,7 @@ from uitest_helper import UITest, get_state_as_dict
from helper import mkPropertyValues
from UITestCase import UITestCase
from uitest.framework import UITestCase
import time
