uitest/calc_tests/about_test.py | 2
uitest/calc_tests/create_chart.py | 14 ----
uitest/calc_tests/create_range_name.py | 14 ----
uitest/calc_tests/function_wizard.py | 15 -----
uitest/calc_tests/gridwin.py | 16 -----
uitest/calc_tests/gridwindow.py | 16 -----
uitest/demo_ui/char_dialog.py | 3 -
uitest/demo_ui/checkbox.py | 16 -----
uitest/demo_ui/combobox.py | 4 -
uitest/demo_ui/edit.py | 14 ----
uitest/demo_ui/gridwin.py | 16 -----
uitest/demo_ui/listbox.py | 4 -
uitest/demo_ui/radiobutton.py | 4 -
uitest/demo_ui/spinfield.py | 18 ------
uitest/demo_ui/tabcontrol.py | 17 ------
uitest/demo_ui/tabdialog.py | 6 --
uitest/demo_ui/treelist.py | 18 ------
uitest/helper.py | 41 --------------
uitest/impress_tests/start.py | 14 ----
uitest/libreoffice/connection.py | 1
uitest/libreoffice/uno/propertyvalue.py | 38 +++++++++++++
uitest/uitest/config.py | 2
uitest/uitest/framework.py | 2
uitest/uitest/test.py | 84 +++++++++++++++++++++++++++++
uitest/uitest/uihelper/calc.py | 2
uitest/uitest/uihelper/common.py | 13 ++++
uitest/uitest_helper.py | 90 --------------------------------
uitest/writer_tests/start.py | 14 ----
28 files changed, 161 insertions(+), 337 deletions(-)
New commits:
commit 7580d67eff34b626903163f26d6448f80a3edc45
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Jul 13 11:18:18 2016 +0200
uitest: all files moved to the new directory layout
Change-Id: Ib5a6fc98fafb774ca5c7cc1323dbe4eb8a1c4aff
diff --git a/uitest/calc_tests/about_test.py b/uitest/calc_tests/about_test.py
index 1495837..00ba9bc 100644
--- a/uitest/calc_tests/about_test.py
+++ b/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):
diff --git a/uitest/calc_tests/create_chart.py
b/uitest/calc_tests/create_chart.py
index 64a5a03..ec73da7 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/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
diff --git a/uitest/calc_tests/create_range_name.py
b/uitest/calc_tests/create_range_name.py
index 464c1f9..36a0f63 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/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
diff --git a/uitest/calc_tests/function_wizard.py
b/uitest/calc_tests/function_wizard.py
index 66d9282..ec0920d 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/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
diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 5b3b2cd..57a8fbc 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/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
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index ef547ba..46ed88a 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/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
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
index 9338352..1b90476 100644
--- a/uitest/demo_ui/char_dialog.py
+++ b/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
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index e4abfd6..b97e734 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/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
diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py
index 3fa42a2..5e35175 100644
--- a/uitest/demo_ui/combobox.py
+++ b/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
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index 3777807..8581e89 100644
--- a/uitest/demo_ui/edit.py
+++ b/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
diff --git a/uitest/demo_ui/gridwin.py b/uitest/demo_ui/gridwin.py
index c4223f6..26721a1 100644
--- a/uitest/demo_ui/gridwin.py
+++ b/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
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index e297746..c7cc4f2 100644
--- a/uitest/demo_ui/listbox.py
+++ b/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
diff --git a/uitest/demo_ui/radiobutton.py b/uitest/demo_ui/radiobutton.py
index 0867085..b3df02c 100644
--- a/uitest/demo_ui/radiobutton.py
+++ b/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
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index 15d68b7..1cf8756 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/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
diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py
index 35f7465..600de28 100644
--- a/uitest/demo_ui/tabcontrol.py
+++ b/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
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index b914ae2..141cd93 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/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
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index ae79671..1ea7dc1 100644
--- a/uitest/demo_ui/treelist.py
+++ b/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
diff --git a/uitest/uitest/config.py b/uitest/uitest/config.py
index fa13274..c08c208 100644
--- a/uitest/uitest/config.py
+++ b/uitest/uitest/config.py
@@ -7,4 +7,6 @@
use_sleep = False
+DEFAULT_SLEEP = 0.1
+
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/uitest/framework.py b/uitest/uitest/framework.py
index a6f804b..b2f4a32 100644
--- a/uitest/uitest/framework.py
+++ b/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
diff --git a/uitest/uitest_helper.py b/uitest/uitest/test.py
similarity index 83%
rename from uitest/uitest_helper.py
rename to uitest/uitest/test.py
index 979ebbc..05e5c91 100644
--- a/uitest/uitest_helper.py
+++ b/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: */
commit 7f587841de509515fd977cc12b8d3903f442e87d
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Jul 13 10:54:35 2016 +0200
uitest: move more parts to the new directory structure
Change-Id: I9dab4c0beef08b04e65dc0dae337a822041cf218
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index 41637c8..15d68b7 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/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
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index ea584c3..ae79671 100644
--- a/uitest/demo_ui/treelist.py
+++ b/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
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index 7d8a0b2..aada10b 100644
--- a/uitest/impress_tests/start.py
+++ b/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
diff --git a/uitest/uitest/uihelper/common.py b/uitest/uitest/uihelper/common.py
new file mode 100644
index 0000000..2e99140
--- /dev/null
+++ b/uitest/uitest/uihelper/common.py
@@ -0,0 +1,13 @@
+# -*- 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: */
diff --git a/uitest/uitest_helper.py b/uitest/uitest_helper.py
index a2efe6b..979ebbc 100644
--- a/uitest/uitest_helper.py
+++ b/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: */
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index 8b29e31..fe4c054 100644
--- a/uitest/writer_tests/start.py
+++ b/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
commit 65a31df69f8fd07fdd8cd7423348b474e39b960d
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Jul 10 18:32:12 2016 +0200
uitest: remove the imports for pyuno and time
Change-Id: I384e9ee1a38aad80bf3a4906a4955c57e4895538
diff --git a/uitest/calc_tests/create_chart.py
b/uitest/calc_tests/create_chart.py
index 356fcb2..64a5a03 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -13,16 +13,6 @@ from uitest.framework import UITestCase
import time
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class CalcChartUIDemo(UITestCase):
def add_content_to_cell(self, gridwin, cell, content):
diff --git a/uitest/calc_tests/create_range_name.py
b/uitest/calc_tests/create_range_name.py
index 6c61d14..464c1f9 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/uitest/calc_tests/create_range_name.py
@@ -11,16 +11,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class CreateRangeNameTest(UITestCase):
def test_create_range_name(self):
diff --git a/uitest/calc_tests/function_wizard.py
b/uitest/calc_tests/function_wizard.py
index 7c37a2c..66d9282 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/uitest/calc_tests/function_wizard.py
@@ -8,20 +8,9 @@
from uitest_helper import UITest
from libreoffice.uno.propertyvalue import mkPropertyValues
-import time
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class FunctionWizardTest(UITestCase):
# tdf#98427
def test_open_function_wizard(self):
diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index ba50bae..5b3b2cd 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -11,18 +11,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
-import time
-
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class GridWinTest(UITestCase):
def test_select_object(self):
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index 7589467..ef547ba 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/uitest/calc_tests/gridwindow.py
@@ -13,18 +13,6 @@ from uitest.uihelper.calc import enter_text_to_cell
from uitest.framework import UITestCase
-import time
-
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class GridWindowTest(UITestCase):
def test_input(self):
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index 9555206..e4abfd6 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -11,18 +11,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
-import time
-
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class CheckBoxTest(UITestCase):
def test_toggle_checkbox(self):
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index b5dda59..3777807 100644
--- a/uitest/demo_ui/edit.py
+++ b/uitest/demo_ui/edit.py
@@ -11,16 +11,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class EditTest(UITestCase):
def test_type_text(self):
diff --git a/uitest/demo_ui/gridwin.py b/uitest/demo_ui/gridwin.py
index d46506c..c4223f6 100644
--- a/uitest/demo_ui/gridwin.py
+++ b/uitest/demo_ui/gridwin.py
@@ -11,18 +11,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
-import time
-
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class GridWinTest(UITestCase):
def test_select_cell(self):
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index c9912b1..41637c8 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/uitest/demo_ui/spinfield.py
@@ -10,20 +10,8 @@ from uitest_helper import UITest
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest_helper import get_state_as_dict
-import time
-
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class SpinFieldTest(UITestCase):
def test_up(self):
diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py
index 196bcb8..35f7465 100644
--- a/uitest/demo_ui/tabcontrol.py
+++ b/uitest/demo_ui/tabcontrol.py
@@ -5,8 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-import time
-
from uitest_helper import UITest
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -15,16 +13,6 @@ from uitest.uihelper.calc import enter_text_to_cell
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class TabControlTest(UITestCase):
def test_select_pos(self):
@@ -49,4 +37,3 @@ class TabControlTest(UITestCase):
self.ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index ee57d31..b914ae2 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -9,8 +9,6 @@ from uitest_helper import UITest
from libreoffice.uno.propertyvalue import mkPropertyValues
-import time
-
from uitest.framework import UITestCase
class TabDialogTest(UITestCase):
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index e708c45..ea584c3 100644
--- a/uitest/demo_ui/treelist.py
+++ b/uitest/demo_ui/treelist.py
@@ -5,8 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-import time
-
from uitest_helper import UITest
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -16,16 +14,6 @@ from uitest_helper import get_state_as_dict
from uitest.framework import UITestCase
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class TreeListTest(UITestCase):
def test_expand(self):
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index 16b4a7d..7d8a0b2 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -13,16 +13,6 @@ from uitest.framework import UITestCase
import time
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class SimpleImpressTest(UITestCase):
def test_start_impress(self):
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index d5a68b8..8b29e31 100644
--- a/uitest/writer_tests/start.py
+++ b/uitest/writer_tests/start.py
@@ -13,16 +13,6 @@ from uitest.framework import UITestCase
import time
-try:
- import pyuno
- import uno
- import unohelper
-except ImportError:
- print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
class SimpleWriterTest(UITestCase):
def test_start_writer(self):
commit bec5a2639636635c9184beda2f63fe4a9a16a9b8
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Jul 10 18:21:51 2016 +0200
uitest: move more code into the new directory layout
Change-Id: Ic5d08f08c1fccc74be09cea7887d3acb910e7636
diff --git a/uitest/calc_tests/create_chart.py
b/uitest/calc_tests/create_chart.py
index 322618b..356fcb2 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 a265970..6c61d14 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 b7ab11d..7c37a2c 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 3366dc0..ba50bae 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 7620df1..7589467 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 06c17bb..9338352 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 718444e..9555206 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 81c06ba..3fa42a2 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 bb3b2ee..b5dda59 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 60dfac5..d46506c 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 487d476..e297746 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 23d7aba..0867085 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 b581a03..c9912b1 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 cc04221..196bcb8 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 0cbc4ec..ee57d31 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 ef5512a..e708c45 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 5657b69..16b4a7d 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
similarity index 100%
rename from uitest/helper.py
rename to uitest/libreoffice/uno/propertyvalue.py
diff --git a/uitest/uitest/uihelper/calc.py b/uitest/uitest/uihelper/calc.py
index 66e85e1..b63f170 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 049929c..a2efe6b 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 40aebcb..d5a68b8 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
commit fd68096c6cc55ed0087517e0c60285e40efb92f5
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Jul 10 16:50:16 2016 +0200
uitest: remove unused imports
Change-Id: I620d01f2cfbc5327c2fcaf020d50e9184fc1d1b2
diff --git a/uitest/helper.py b/uitest/helper.py
index 9b24bee..b64c49b 100644
--- a/uitest/helper.py
+++ b/uitest/helper.py
@@ -5,9 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-import os
-import subprocess
-
try:
import pyuno
import uno
commit 647176064429c94b16ae2ce02963e2d0e85b9cbc
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Jul 10 16:47:50 2016 +0200
uitest: remove print statement
Change-Id: I1065acf0f2406881532e75459bfddbdb7967ad8b
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 86c5d66..a39b42f 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -63,7 +63,6 @@ class OfficeConnection:
argv.insert(2, "run")
argv.insert(3, "--args")
argv[4] = argv[4].replace("soffice", "soffice.bin")
- print(argv)
self.pro = subprocess.Popen(argv)
return self.pro
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
