diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-13 10:54:35 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-13 11:29:56 +0200 |
| commit | 7f587841de509515fd977cc12b8d3903f442e87d (patch) | |
| tree | 9b7a508dea8715a411cd00113365559e9f0a7b28 /uitest | |
| parent | 65a31df69f8fd07fdd8cd7423348b474e39b960d (diff) | |
uitest: move more parts to the new directory structure
Change-Id: I9dab4c0beef08b04e65dc0dae337a822041cf218
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/demo_ui/spinfield.py | 2 | ||||
| -rw-r--r-- | uitest/demo_ui/treelist.py | 2 | ||||
| -rw-r--r-- | uitest/impress_tests/start.py | 2 | ||||
| -rw-r--r-- | uitest/uitest/uihelper/common.py | 13 | ||||
| -rw-r--r-- | uitest/uitest_helper.py | 5 | ||||
| -rw-r--r-- | uitest/writer_tests/start.py | 2 |
6 files changed, 17 insertions, 9 deletions
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py index 41637c8e241b..15d68b7396f9 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 ea584c3d3a04..ae7967159b15 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 7d8a0b279433..aada10b4b0ba 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 000000000000..2e991400c050 --- /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 a2efe6b011e1..979ebbc7342d 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 8b29e31ae682..fe4c054f7850 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 |