From 901aa845b7b7fe0e0f2ed483d3b8e7b7ffd8b894 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 26 Jun 2016 02:29:37 +0200 Subject: uitest: move for files into the new directory layout Change-Id: Ic8289da6bd32ed9645253b996269be6e82bd1d7c --- uitest/calc_tests/gridwindow.py | 2 +- uitest/demo_ui/tabcontrol.py | 2 +- uitest/demo_ui/treelist.py | 2 +- uitest/uihelper/__init__.py | 0 uitest/uihelper/calc.py | 15 --------------- uitest/uitest/uihelper/__init__.py | 0 uitest/uitest/uihelper/calc.py | 15 +++++++++++++++ 7 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 uitest/uihelper/__init__.py delete mode 100644 uitest/uihelper/calc.py create mode 100644 uitest/uitest/uihelper/__init__.py create mode 100644 uitest/uitest/uihelper/calc.py diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py index 4dfa83a46cff..7620df14a62e 100644 --- a/uitest/calc_tests/gridwindow.py +++ b/uitest/calc_tests/gridwindow.py @@ -9,7 +9,7 @@ from uitest_helper import UITest from helper import mkPropertyValues -from uihelper.calc import enter_text_to_cell +from uitest.uihelper.calc import enter_text_to_cell from uitest.framework import UITestCase diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py index 222a4238d00e..cc04221ede74 100644 --- a/uitest/demo_ui/tabcontrol.py +++ b/uitest/demo_ui/tabcontrol.py @@ -11,7 +11,7 @@ from uitest_helper import UITest from helper import mkPropertyValues -from uihelper.calc import enter_text_to_cell +from uitest.uihelper.calc import enter_text_to_cell from uitest.framework import UITestCase diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py index 3814344afecd..ef5512a569d5 100644 --- a/uitest/demo_ui/treelist.py +++ b/uitest/demo_ui/treelist.py @@ -10,7 +10,7 @@ import time from uitest_helper import UITest from helper import mkPropertyValues -from uihelper.calc import enter_text_to_cell +from uitest.uihelper.calc import enter_text_to_cell from uitest_helper import get_state_as_dict diff --git a/uitest/uihelper/__init__.py b/uitest/uihelper/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/uitest/uihelper/calc.py b/uitest/uihelper/calc.py deleted file mode 100644 index 66e85e146d5b..000000000000 --- a/uitest/uihelper/calc.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- 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 helper import mkPropertyValues - -def enter_text_to_cell(gridwin, cell, text): - gridwin.executeAction("SELECT", mkPropertyValues({"CELL": cell})) - gridwin.executeAction("TYPE", mkPropertyValues({"TEXT": text})) - gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uitest/uitest/uihelper/__init__.py b/uitest/uitest/uihelper/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/uitest/uitest/uihelper/calc.py b/uitest/uitest/uihelper/calc.py new file mode 100644 index 000000000000..66e85e146d5b --- /dev/null +++ b/uitest/uitest/uihelper/calc.py @@ -0,0 +1,15 @@ +# -*- 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 helper import mkPropertyValues + +def enter_text_to_cell(gridwin, cell, text): + gridwin.executeAction("SELECT", mkPropertyValues({"CELL": cell})) + gridwin.executeAction("TYPE", mkPropertyValues({"TEXT": text})) + gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3