Merge lp:~ken-vandine/ubuntu-system-settings/ap_sanity_helpers into lp:ubuntu-system-settings

[Ken VanDine]

incorporate SimPin helper from ubuntu-sanity-tests and refactor a few tests to utilize them

incorporate SimPin helper from ubuntu-sanity-tests and refactor a few tests to utilize them

[lp:~ken-vandine/ubuntu-system-settings/ap_sanity_helpers]

1410. By Ken VanDine on 2015-05-12

Fixed pyflakes failure

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1410
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2096/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/366
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2748
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2748/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20423

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2096/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1410
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20433

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2097/rebuild

review: Approve (continuous-integration)

[Brendan Donegan (brendan-donegan)]

LGTM +1

review: Approve

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-04-07 14:27:37 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-05-12 16:32:47 +0000
@@ -421,14 +421,16 @@
 
     """Autopilot helper for the SimPin Page."""
 
-    def get_sim_pin_switch(self):
+    def get_sim_pin_switch(self, sim_number):
         """Return the SIM PIN switch."""
-        return self.select_single(objectName='simPinSwitch')
+        switches = self.select_many(objectName='simPinSwitch')
+        switches = sorted(switches, key=lambda switch: (switch.globalRect.y))
+        return switches[sim_number]
 
     @autopilot.logging.log_action(logger.debug)
-    def click_sim_pin_switch(self):
+    def click_sim_pin_switch(self, sim_number):
         """Click on the SIM PIN switch, return the SIM PIN dialog."""
-        sim_pin_switch = self.get_sim_pin_switch()
+        sim_pin_switch = self.get_sim_pin_switch(sim_number)
         self.pointing_device.click_object(sim_pin_switch)
         return self.get_root_instance().wait_select_single(
             objectName='lockDialogComponent'

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-02-19 15:18:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-05-12 16:32:47 +0000
@@ -199,22 +199,19 @@
         )
 
     def test_sim_pin_lock_control(self):
-        self._go_to_sim_lock()
-        sim_lock_control = self.main_view.select_single(
-            objectName='simPinSwitch'
-        )
+        sim_pin_page = self.security_page.go_to_sim_lock()
+
+        switch = sim_pin_page.get_sim_pin_switch(0)
         locked = len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
-        self.assertEquals(locked, sim_lock_control.checked)
+        self.assertEquals(locked, switch.checked)
 
     def test_sim_pin_lock_control_unlock(self):
-        self._go_to_sim_lock()
-        sim_lock_control = self.main_view.select_single(
-            objectName='simPinSwitch'
-        )
-
-        self.assertTrue(sim_lock_control.checked)
-
-        self.main_view.scroll_to_and_click(sim_lock_control)
+        sim_pin_page = self.security_page.go_to_sim_lock()
+        switch = sim_pin_page.get_sim_pin_switch(0)
+
+        self.assertTrue(switch.checked)
+
+        sim_pin_page.click_sim_pin_switch(0)
 
         lock_dialog = self.main_view.select_single(
             objectName='lockDialogComponent'
@@ -252,22 +249,20 @@
 
         self.main_view.scroll_to_and_click(submit_button)
 
-        self.assertFalse(sim_lock_control.checked)
+        self.assertFalse(switch.checked)
 
         locked = len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
-        self.assertEquals(locked, sim_lock_control.checked)
+        self.assertEquals(locked, switch.checked)
 
     @unittest.skip('skipped because the simPinSwitch state fails to update')
     def test_sim_pin_lock_control_lock(self):
         self.modem_0.Set(SIM_IFACE, 'LockedPins', "")
-        self._go_to_sim_lock()
-        sim_lock_control = self.main_view.select_single(
-            objectName='simPinSwitch'
-        )
-
-        self.assertFalse(sim_lock_control.checked)
-
-        self.main_view.scroll_to_and_click(sim_lock_control)
+        sim_pin_page = self.security_page.go_to_sim_lock()
+        switch = sim_pin_page.get_sim_pin_switch(0)
+
+        self.assertFalse(switch.checked)
+
+        sim_pin_page.click_sim_pin_switch(0)
 
         lock_dialog = self.main_view.select_single(
             objectName='lockDialogComponent'
@@ -305,24 +300,22 @@
 
         self.main_view.scroll_to_and_click(submit_button)
 
-        self.assertTrue(sim_lock_control.checked)
+        self.assertTrue(switch.checked)
 
         self.assertEqual(['pin'], self.modem_0.Get(SIM_IFACE, 'LockedPins'))
         locked = len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
-        self.assertEquals(locked, sim_lock_control.checked)
+        self.assertEquals(locked, switch.checked)
 
     def test_sim_pin_lock_control_unlock_fail(self):
-        self._go_to_sim_lock()
-        sim_lock_control = self.main_view.select_single(
-            objectName='simPinSwitch'
-        )
+        sim_pin_page = self.security_page.go_to_sim_lock()
+        switch = sim_pin_page.get_sim_pin_switch(0)
 
         self.assertTrue(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         )
-        self.assertTrue(sim_lock_control.checked)
+        self.assertTrue(switch.checked)
 
-        self.main_view.scroll_to_and_click(sim_lock_control)
+        sim_pin_page.click_sim_pin_switch(0)
 
         lock_dialog = self.main_view.select_single(
             objectName='lockDialogComponent'
@@ -363,16 +356,13 @@
     @unittest.skip('skipped because the simPinSwitch state fails to update')
     def test_sim_pin_lock_control_lock_fail(self):
         self.modem_0.Set(SIM_IFACE, 'LockedPins', "")
-        self._go_to_sim_lock()
-        sim_lock_control = self.main_view.select_single(
-            objectName='simPinSwitch'
-        )
+        sim_pin_page = self.security_page.go_to_sim_lock()
 
         self.assertFalse(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         )
 
-        self.main_view.scroll_to_and_click(sim_lock_control)
+        sim_pin_page.click_sim_pin_switch(0)
 
         lock_dialog = self.main_view.select_single(
             objectName='lockDialogComponent'