Merge lp:~elopio/ubuntu-ui-toolkit/clean_toggles2 into lp:ubuntu-ui-toolkit

[Leo Arias]

Cleaned up the gallery toggles autopilot tests.

[lp:~elopio/ubuntu-ui-toolkit/clean_toggles2]

813. By Leo Arias on 2013-10-31

Merged with parent branch.

814. By Leo Arias on 2013-10-31

Fixed pep8 errors.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:812
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/233/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1134/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:814
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/234/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1135/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/clean_toggles2]

815. By Leo Arias on 2013-10-31

Fixed pep8 error.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/245
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/245
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2858
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2909/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/763
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/762

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1137/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/256
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/248
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2867
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2919
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/782
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/779

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1140/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/273
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/273/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2933
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/810
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/811

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1144/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-31 08:45:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-31 08:45:20 +0000
@@ -329,26 +329,39 @@
 class CheckBox(UbuntuUIToolkitEmulatorBase):
     """CheckBox Autopilot emulator."""
 
-    def check(self):
-        """Check a CheckBox, if its not already checked."""
+    def check(self, time_out=10):
+        """Check a CheckBox, if its not already checked.
+
+        :parameter time_out: number of seconds to wait for the CheckBox to be
+            checked. Default is 10.
+
+        """
         if not self.checked:
-            self.change_state()
-
-    def uncheck(self):
-        """Uncheck a CheckBox, if its not already unchecked."""
+            self.change_state(time_out)
+
+    def uncheck(self, time_out=10):
+        """Uncheck a CheckBox, if its not already unchecked.
+
+        :parameter time_out: number of seconds to wait for the CheckBox to be
+            unchecked. Default is 10.
+
+        """
         if self.checked:
-            self.change_state()
+            self.change_state(time_out)
 
-    def change_state(self):
+    def change_state(self, time_out=10):
         """Change the state of a CheckBox.
 
         If it is checked, it will be unchecked. If it is unchecked, it will be
         checked.
 
+        :parameter time_out: number of seconds to wait for the CheckBox state
+            to change. Default is 10.
+
         """
         original_state = self.checked
         self.pointing_device.click_object(self)
-        self.checked.wait_for(not original_state)
+        self.checked.wait_for(not original_state, time_out)
 
 
 class Empty(UbuntuUIToolkitEmulatorBase):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2013-10-07 13:11:40 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2013-10-31 08:45:20 +0000
@@ -37,41 +37,6 @@
         self.loadItem(item)
         self.checkPageHeader(item)
 
-    def test_toggles(self):
-        item = "Toggles"
-        self.checkListItem(item)
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
-        # check default states
-        item_data = [
-            ["checkbox_unchecked", False, True],
-            ["checkbox_checked", True, True],
-            ["checkbox_disabled_unchecked", False, False],
-            ["checkbox_disabled_checked", True, False],
-            ["switch_unchecked", False, True],
-            ["switch_checked", True, True],
-            ["switch_disabled_unchecked", False, False],
-            ["switch_disabled_checked", True, False]
-        ]
-
-        for data in item_data:
-            objName = data[0]
-            objChecked = data[1]
-            objEnabled = data[2]
-
-            obj = self.getObject(objName)
-            self.assertThat(obj.checked, Equals(objChecked))
-            self.assertThat(obj.enabled, Equals(objEnabled))
-
-            # try to interact with objects
-            self.tap(objName)
-
-            if (obj.enabled):
-                self.assertThat(obj.checked, Not(Equals(objChecked)))
-            else:
-                self.assertThat(obj.checked, Equals(objChecked))
-
     def test_slider(self):
         item = "Slider"
         self.loadItem(item)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2013-10-31 08:45:20 +0000
@@ -0,0 +1,79 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit import emulators
+from ubuntuuitoolkit.tests import gallery
+
+from testtools.matchers import Equals
+
+
+class EnabledTogglesTestCase(gallery.GalleryTestCase):
+
+    scenarios = [
+        ('checkbox unchecked', dict(
+            object_name='checkbox_unchecked', initial_state=False)),
+        ('checkbox checked', dict(
+            object_name='checkbox_checked', initial_state=True)),
+        ('switch unchecked', dict(
+            object_name='switch_unchecked', initial_state=False)),
+        ('switch checked', dict(
+            object_name='switch_checked', initial_state=True))
+    ]
+
+    def setUp(self):
+        super(EnabledTogglesTestCase, self).setUp()
+        item = "Toggles"
+        self.checkListItem(item)
+        self.loadItem(item)
+        self.checkPageHeader(item)
+
+    def test_change_toggles_state(self):
+        toggle = self.main_view.select_single(
+            emulators.CheckBox, objectName=self.object_name)
+        self.assertThat(toggle.enabled, Equals(True))
+        self.assertThat(toggle.checked, Equals(self.initial_state))
+
+        toggle.change_state(time_out=1)
+        self.assertThat(toggle.checked, Equals(not self.initial_state))
+
+
+class DisabledTogglesTestCase(gallery.GalleryTestCase):
+
+    scenarios = [
+        ('checkbox disabled unchecked', dict(
+            object_name='checkbox_disabled_unchecked', initial_state=False)),
+        ('checkbox disabled checked', dict(
+            object_name='checkbox_disabled_checked', initial_state=True)),
+        ('switch disabled unchecked', dict(
+            object_name='switch_disabled_unchecked', initial_state=False)),
+        ('switch disabled checked', dict(
+            object_name='switch_disabled_checked', initial_state=True))
+    ]
+
+    def setUp(self):
+        super(DisabledTogglesTestCase, self).setUp()
+        item = "Toggles"
+        self.checkListItem(item)
+        self.loadItem(item)
+        self.checkPageHeader(item)
+
+    def test_change_toggles_state(self):
+        toggle = self.main_view.select_single(
+            emulators.CheckBox, objectName=self.object_name)
+        self.assertThat(toggle.enabled, Equals(False))
+        self.assertThat(toggle.checked, Equals(self.initial_state))
+
+        self.assertRaises(AssertionError, toggle.change_state, time_out=1)