shell and indicators AP test suites now reside in parent unity8 suite.
commit5f02b49f1701c2fc6bd9513c4abc54666a25ce1c
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateWed 10 Jul 2013, 16:31 (13 years ago)
parentc045f60
CMakeLists.txt+2−2
@@ -91,8 +91,8 @@ enable_testing()
9191
9292# Autopilot tests
9393include(autopilot)
94−declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
95−declare_autopilot_test(indicators_client ${CMAKE_SOURCE_DIR}/tests/autopilot/)
94+declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
95+declare_autopilot_test(indicators_client unity8.indicators_client ${CMAKE_SOURCE_DIR}/tests/autopilot/)
9696
9797add_subdirectory(tests)
9898
cmake/modules/autopilot.cmake+2−2
@@ -1,8 +1,8 @@
11add_custom_target(autopilot)
22
3−function(declare_autopilot_test TEST_NAME WORKING_DIR)
3+function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
44 add_custom_target(autopilot-${TEST_NAME}
5− COMMAND autopilot run ${TEST_NAME}
5+ COMMAND autopilot run ${TEST_SUITE}
66 WORKING_DIRECTORY ${WORKING_DIR}
77 )
88
tests/autopilot/indicators_client/__init__.py → tests/autopilot/unity8/indicators_client/__init__.pyrenamed+1−1
@@ -5,4 +5,4 @@
55# under the terms of the GNU General Public License version 3, as published
66# by the Free Software Foundation.
77
8−"""indicators-client autopilot tests and emulators - top level package."""
8+"""unity8 indicators-client autopilot tests and emulators - sub level package."""
tests/autopilot/indicators_client/emulators/__init__.py → tests/autopilot/unity8/indicators_client/emulators/__init__.pyrenamed
The content is the same.
tests/autopilot/indicators_client/emulators/common.py → tests/autopilot/unity8/indicators_client/emulators/common.pyrenamed
The content is the same.
tests/autopilot/indicators_client/emulators/main_window.py → tests/autopilot/unity8/indicators_client/emulators/main_window.pyrenamed−2
@@ -5,8 +5,6 @@
55# under the terms of the GNU General Public License version 3, as published
66# by the Free Software Foundation.
77
8−from indicators_client.emulators import IndicatorsIntrospectionObject
9−
108class MainWindow(object):
119 """An emulator class that makes it easy to interact with the shell"""
1210
tests/autopilot/indicators_client/tests/__init__.py → tests/autopilot/unity8/indicators_client/tests/__init__.pyrenamed+1−1
@@ -15,7 +15,7 @@ from autopilot.matchers import Eventually
1515from autopilot.platform import model
1616from testtools.matchers import Equals
1717
18−from indicators_client.emulators.main_window import MainWindow
18+from unity8.indicators_client.emulators.main_window import MainWindow
1919from logging import getLogger
2020import sys
2121from time import sleep
tests/autopilot/indicators_client/tests/test_battery.py → tests/autopilot/unity8/indicators_client/tests/test_battery.pyrenamed+1−1
@@ -10,7 +10,7 @@
1010from testtools.matchers import Equals, NotEquals
1111from autopilot.matchers import Eventually
1212
13−from indicators_client.tests import IndicatorsTestCase
13+from unity8.indicators_client.tests import IndicatorsTestCase
1414from time import sleep
1515import random
1616import math
tests/autopilot/unity8/__init__.py → tests/autopilot/unity8/shell/__init__.pyrenamed+1−1
@@ -5,4 +5,4 @@
55# under the terms of the GNU General Public License version 3, as published
66# by the Free Software Foundation.
77
8−"""unity8 autopilot tests and emulators - top level package."""
8+"""unity8 shell autopilot tests and emulators - sub level package."""
tests/autopilot/unity8/emulators/__init__.py → tests/autopilot/unity8/shell/emulators/__init__.pyrenamed
The content is the same.
tests/autopilot/unity8/emulators/main_window.py → tests/autopilot/unity8/shell/emulators/main_window.pyrenamed
The content is the same.
tests/autopilot/unity8/tests/__init__.py → tests/autopilot/unity8/shell/tests/__init__.pyrenamed+1−1
@@ -15,7 +15,7 @@ from autopilot.matchers import Eventually
1515from autopilot.platform import model
1616from testtools.matchers import Equals
1717
18−from unity8.emulators.main_window import MainWindow
18+from unity8.shell.emulators.main_window import MainWindow
1919
2020class FormFactors(object):
2121 Phone, Tablet, Desktop = range(3)
tests/autopilot/unity8/tests/helpers.py → tests/autopilot/unity8/shell/tests/helpers.pyrenamed
The content is the same.
tests/autopilot/unity8/tests/testbigscreen.py → tests/autopilot/unity8/shell/tests/testbigscreen.pyrenamed+1−1
@@ -10,7 +10,7 @@
1010from testtools.matchers import Equals
1111from autopilot.matchers import Eventually
1212
13−from unity8.tests import ShellTestCase
13+from unity8.shell.tests import ShellTestCase
1414
1515class TestBig(ShellTestCase):
1616 def setUp(self):
tests/autopilot/unity8/tests/testhud.py → tests/autopilot/unity8/shell/tests/testhud.pyrenamed+2−2
@@ -25,8 +25,8 @@
2525
2626from __future__ import absolute_import
2727
28−from unity8.tests import ShellTestCase, FormFactors
29−from unity8.tests.helpers import TestShellHelpers
28+from unity8.shell.tests import ShellTestCase, FormFactors
29+from unity8.shell.tests.helpers import TestShellHelpers
3030
3131from autopilot.input import Mouse, Touch, Pointer
3232from testtools.matchers import Equals, NotEquals, GreaterThan, MismatchError
tests/autopilot/unity8/tests/testlockscreen.py → tests/autopilot/unity8/shell/tests/testlockscreen.pyrenamed+2−2
@@ -25,8 +25,8 @@
2525
2626from __future__ import absolute_import
2727
28−from unity8.tests import ShellTestCase, FormFactors
29−from unity8.tests.helpers import TestShellHelpers
28+from unity8.shell.tests import ShellTestCase, FormFactors
29+from unity8.shell.tests.helpers import TestShellHelpers
3030
3131from autopilot.input import Mouse, Touch, Pointer
3232from testtools.matchers import Equals, NotEquals, GreaterThan, MismatchError