Merge lp:~nik90/ubuntu-clock-app/remove-optionselector-ap-hack into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Removed the custom OptionSelector AP emulator function that was written and replaces it with the official SDK AP emualator function.

This MP removes the custom OptionSelector AP emulator function that was written and replaces it with the official SDK AP emualator function. The code is much cleaner now.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:415
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/370/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2808
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/345
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/370/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

There is just one small thing that I expected in the SDK emulator function. Currently if part of the optionselector is hidden, the emulator does not scroll up before clicking on the optionselector item. As a result, I have had to add,

52 # Wait for the option selector to expand
55 if not day_option_selector.currentlyExpanded:
56 # Click on days option selector to expand it
57 self.pointing_device.click_object(day_option_selector)

59 if not self.main_view.wideAspect:
60 self.drag_page_up()

Should I report a bug about this in the SDK? Or are there any better ideas?

review: Needs Information

[lp:~nik90/ubuntu-clock-app/remove-optionselector-ap-hack]

416. By Nekhelesh Ramananthan on 2014-05-23

Added fixme notes where required

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:416
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/372/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2815
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/352
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/290
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/19

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/372/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/remove-optionselector-ap-hack]

417. By Nekhelesh Ramananthan on 2014-05-23

merge trunk

[Leo Arias (elopio)]

Nice! A lot less code. Thanks for cleaning up.

review: Approve (code review)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:417
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/373/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2821
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2821/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/358
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/291
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/20

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/373/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

thanks for adding the #fixme comment :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-05-22 16:50:45 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-05-23 07:57:57 +0000
@@ -284,34 +284,9 @@
 
         """
         time_format_selector = self.proxy_object.wait_select_single(
-            'OptionSelector', objectName='timeFormatSelector')
-
-        # Wait for the option selector to expand
-        # FIXME: Replace this when the ui toolkit provides option selector
-        # emulator functions. http://pad.lv/1277059 -- nik90 2014-03-06
-        if not time_format_selector.currentlyExpanded:
-            # Click on time format option selector to expand it
-            self.proxy_object.pointing_device.click_object(
-                time_format_selector)
-            sleep(2)
-            time_format_selector.currentlyExpanded.wait_for(True)
-
-        # Grab the labels after the option selector has expanded
-        time_format_object = time_format_selector.select_single(
-            'StyledItem', objectName='listContainer')
-        time_formats = time_format_object.select_many('Label', visible=True)
-
-        for index, format_element in enumerate(time_formats):
-            if format_element.text == format:
-                format_index = index
-                break
-        else:
-            raise ClockEmulatorException(
-                'Unknown settings option: {}'.format(format))
-
-        # Click on the time format option
-        self.proxy_object.pointing_device.click_object(
-            time_formats[format_index])
+            toolkit_emulators.OptionSelector, objectName='timeFormatSelector')
+
+        time_format_selector.select_option('Label', text=format)
 
 
 class StopwatchPage(Page):
@@ -412,7 +387,7 @@
         add_alarm_page.set_single_alarm_day(day)
         # FIXME: The swipe down is a temporary fix which is needed until
         # https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/ap-header-show
-        # is resolved
+        # is resolved --nik90 2014-05-23
         if not self.main_view.wideAspect:
             self.drag_page_down()
         self._click_save()
@@ -434,7 +409,7 @@
         add_alarm_page.set_recurring_alarm_days(days)
         # FIXME: The swipe down is a temporary fix which is needed until
         # https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/ap-header-show
-        # is resolved
+        # is resolved --nik90 2014-05-23
         if not self.main_view.wideAspect:
             self.drag_page_down()
         self._click_save()
@@ -600,35 +575,22 @@
         :param day: single day on which alarm is triggered
 
         """
-        # TODO: we need a proper UITK emulator for optionSelector
-        # http://pad.lv/1277059  --nik90 2014-02-06
         day_option_selector = self.select_single(
-            'OptionSelector', objectName='OccursSelector')
+            toolkit_emulators.OptionSelector, objectName='OccursSelector')
 
         # Wait for the option selector to expand
-        # FIXME: Replace this when the ui toolkit provides option selector
-        # emulator functions. -- nik90 2014-03-06
         if not day_option_selector.currentlyExpanded:
             # Click on days option selector to expand it
             self.pointing_device.click_object(day_option_selector)
             sleep(2)
             day_option_selector.currentlyExpanded.wait_for(True)
 
+        # FIXME: This swipe up is not required once
+        # http://pad.lv/1322472  is fixed. --nik90 2014-05-23
         if not self.main_view.wideAspect:
             self.drag_page_up()
 
-        days_object = day_option_selector.select_single(
-            'StyledItem', objectName='listContainer')
-        dayslist = days_object.select_many('Label', visible=True)
-
-        for index, day_element in enumerate(dayslist):
-            if day_element.text == day:
-                day_index = index
-                break
-        else:
-            raise ClockEmulatorException('Unknown day: {}'.format(day))
-
-        self.pointing_device.click_object(dayslist[day_index])
+        day_option_selector.select_option('Label', text=day)
 
     @autopilot_logging.log_action(logger.info)
     def set_recurring_alarm_days(self, days):