diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-13 11:18:18 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-13 11:29:57 +0200 |
commit | 7580d67eff34b626903163f26d6448f80a3edc45 (patch) | |
tree | 53bce15b39145c204f9521e1ab27af1c0ea145fa | |
parent | 7f587841de509515fd977cc12b8d3903f442e87d (diff) |
uitest: all files moved to the new directory layout
Change-Id: Ib5a6fc98fafb774ca5c7cc1323dbe4eb8a1c4aff
-rw-r--r-- | uitest/calc_tests/about_test.py | 2 | ||||
-rw-r--r-- | uitest/calc_tests/create_chart.py | 2 | ||||
-rw-r--r-- | uitest/calc_tests/create_range_name.py | 2 | ||||
-rw-r--r-- | uitest/calc_tests/function_wizard.py | 2 | ||||
-rw-r--r-- | uitest/calc_tests/gridwin.py | 2 | ||||
-rw-r--r-- | uitest/calc_tests/gridwindow.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/char_dialog.py | 3 | ||||
-rw-r--r-- | uitest/demo_ui/checkbox.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/combobox.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/edit.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/gridwin.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/listbox.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/radiobutton.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/spinfield.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/tabcontrol.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/tabdialog.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/treelist.py | 2 | ||||
-rw-r--r-- | uitest/uitest/config.py | 2 | ||||
-rw-r--r-- | uitest/uitest/framework.py | 2 | ||||
-rw-r--r-- | uitest/uitest/test.py (renamed from uitest/uitest_helper.py) | 23 |
20 files changed, 15 insertions, 47 deletions
diff --git a/uitest/calc_tests/about_test.py b/uitest/calc_tests/about_test.py index 1495837c1649..00ba9bca6079 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 64a5a0367c58..ec73da7ac150 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 464c1f9b3c2d..36a0f63ef148 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 66d92822d329..ec0920d64896 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 5b3b2cd180b0..57a8fbcde7c7 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 ef547bae7bf2..46ed88a4e23b 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 933835237dfc..1b90476bd489 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 e4abfd6ee67b..b97e7347da10 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 3fa42a2f6564..5e3517562d61 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 377780710a3b..8581e896bab4 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 c4223f6a0d3c..26721a1b8eff 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 e2977469be63..c7cc4f27fb2a 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 0867085b4414..b3df02c00728 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 15d68b7396f9..1cf8756a2dc4 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 35f746554f18..600de28cb686 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 b914ae2f42d8..141cd93aa30d 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 ae7967159b15..1ea7dc1935ea 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 fa13274863ff..c08c20812524 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 a6f804b84187..b2f4a32469b0 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 index 979ebbc7342d..05e5c91422ba 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: */ |