Ubuntu UI Toolkit

Merge lp:~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker into lp:ubuntu-ui-toolkit

ap_testcases_for_picker
Merge into trunk

Proposed by I Ahmad on 2013-10-21

Status:	Work in progress
Proposed branch:	lp:~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	217 lines (+157/-2) 3 files modified examples/ubuntu-ui-toolkit-gallery/Pickers.qml (+5/-0) tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+3/-2) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py (+149/-0)
To merge this branch:	bzr merge lp:~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-10-23
Chris Gagnon (community)		2013-10-21	Needs Fixing on 2013-10-21
Ubuntu SDK team		2013-10-21	Pending
Review via email: mp+192021@code.launchpad.net

Commit message

fixing review comments

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-21:

FAILED: Continuous integration, rev:792
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker/+merge/192021/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1031/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/465/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4613/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3122/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2013-10-21:

if you use setUp you don't have to have duplicate code to open the page multiple times, see mp lp:~chris.gagnon/ubuntu-ui-toolkit/ap_testcases_for_picker_with_setup/+merge/192037

Doc strings are needed for describing what the test is testing for.
example:
"""circular picker must have a circular property equal to True and must ..."""

Don't hardcode the margin on line LP#52, maybe use instead:
use def flick(self, flickable, direction, delta=40, margin=10):

Otherwise it looks like good initial tests that can be expanded on later with the ap emulators. (I haven't tested this on the phone yet)

review: Needs Fixing

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2013-10-21:

don't import all of time if you just need sleep.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-21:

FAILED: Continuous integration, rev:793
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker/+merge/192021/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-22:

FAILED: Continuous integration, rev:794
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker/+merge/192021/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-22:

FAILED: Continuous integration, rev:795
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker/+merge/192021/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-22:

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

review: Approve (continuous-integration)

Revision history for this message

I Ahmad (iahmad) wrote on 2013-10-22:

I ll wait for Jenkins bot to clear it first.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-23:

Iftikhar, the test runner is now fixed so that it does not mistakenly pass tests that do not complete. As you can see from the above, the autopilot test is getting stuck in some infinite loop and the tests now time out.

Unmerged revisions

795. By I Ahmad on 2013-10-22: fixing the review comments about time import and doc string
794. By I Ahmad on 2013-10-22: merge from chris gagnon branch to move the common code to setUp
793. By I Ahmad on 2013-10-21: missed the import for time module
792. By I Ahmad on 2013-10-21: catchup with trunk
791. By I Ahmad on 2013-10-11: flick margin adjustment
790. By I Ahmad on 2013-10-11: fixing pyflake warnings
789. By I Ahmad on 2013-10-11: work around for missing wait_select_single() method of AP
788. By I Ahmad on 2013-10-11: Added AP tests for Picker control and assigned object names to Picker example

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brian Blevins

Caco V. Topia

I Ahmad

Jaroslavas Karmazinas

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'examples/ubuntu-ui-toolkit-gallery/Pickers.qml'
 --- examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2013-09-12 07:54:12 +0000
 +++ examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2013-10-22 06:08:21 +0000
@@ -26,6 +26,7 @@
          TemplateRow {
              title: i18n.tr("Linear")
              Picker {
++                objectName: "picker_linear"
                  circular: false
                  model: ["Line1", "Line2", "Line3", "Line4", "Line5", "Line6", "Line7", "Line8", "Line9", "Line10"]
@@ -43,6 +44,7 @@
          TemplateRow {
              title: i18n.tr("Circular")
              Picker {
++                objectName: "picker_circular"
                  delegate: PickerDelegate {
                      Label {
                          text: modelData
@@ -66,6 +68,7 @@
          TemplateRow {
              title: i18n.tr("Infinite")
              Picker {
++                objectName: "picker_infinite"
                  id: picker
                  model: ListModel {}
                  circular: false
@@ -101,6 +104,7 @@
          TemplateRow {
              title: i18n.tr("Clock")
              Dialer {
++                objectName: "dialer_clock"
                  size: units.gu(20)
                  handSpace: units.gu(4)
                  minimumValue: 0
@@ -138,6 +142,7 @@
          TemplateRow {
              title: i18n.tr("Overlay")
              Dialer {
++                objectName: "dialer_overlay"
                  size: units.gu(20)
                  handSpace: units.gu(4)
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2013-10-21 07:44:03 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2013-10-22 06:08:21 +0000
@@ -203,12 +203,13 @@
      def flick(self, flickable, direction, delta=40):
          """This funcito flicks the page from middle to the given direction."""
          x, y, w, h = flickable.globalRect
++        margin = 10
          if direction == FlickDirection.UP:
--            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
++            self.pointing_device.drag(x + margin, y + h / 2, x + margin,
                                        y + h / 2 - delta)
              flickable.flicking.wait_for(False)
          elif direction == FlickDirection.DOWN:
--            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
++            self.pointing_device.drag(x + margin, y + h / 2, x + margin,
                                        y + h / 2 + delta)
              flickable.flicking.wait_for(False)
          else:
 === added file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py	2013-10-22 06:08:21 +0000
@@ -0,0 +1,149 @@
++# -*- 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/>.
++
++"""Tests for the Ubuntu UI Toolkit Gallery - OptionSelector component"""
++
++from time import sleep
++from autopilot.matchers import Eventually
++from testtools.matchers import Equals
++from ubuntuuitoolkit.tests.gallery import GalleryTestCase
++from ubuntuuitoolkit.tests import FlickDirection
++
++
++class Direction:
++    """Enum for Circular Picker direction."""
++
++    BACKWARD, FORWARD = range(0, 2)
++
++
++class PickerTests(GalleryTestCase):
++    """Generic tests for the Gallery"""
++
++    def setUp(self):
++        super(PickerTests, self).setUp()
++        item = "Pickers"
++        self.loadItem(item)
++        self.checkPageHeader(item)
++
++    def test_picker_dialer(self):
++        dialer_clock = self.getObject('dialer_clock')
++        #Flick upward to reveal the hidden ui element.
++        flickable = self.main_view.select_single('QQuickFlickable')
++        self.assertIsNotNone(flickable)
++        self.reveal_item_by_flick(dialer_clock, flickable, FlickDirection.UP)
++        self.assertThat(flickable.flicking, Eventually(Equals(False)))
++        #TODO: Need to add more testing logic.
++
++    def test_picker_dialerhand(self):
++        dialer_overlay = self.getObject('dialer_overlay')
++        #Flick upward to reveal the hidden ui element.
++        flickable = self.main_view.select_single('QQuickFlickable')
++        self.assertIsNotNone(flickable)
++        self.reveal_item_by_flick(dialer_overlay, flickable, FlickDirection.UP)
++        self.assertThat(flickable.flicking, Eventually(Equals(False)))
++        #TODO: Need to add more testing logic.
++
++    def test_picker_linear_picker(self):
++        """Testing the linear picker"""
++
++        linear = self.getObject('picker_linear')
++        self.assertThat(linear.circular, Equals(False))
++        listview = linear.select_single('QQuickListView')
++        self.assertIsNotNone(listview)
++        count = listview.count
++        for i in range(0, count):
++            line = linear.select_single('Label', text='Line' + str(i + 1))
++            self.assertIsNotNone(line)
++            self.pointing_device.click_object(line)
++            linear = self.getObject('picker_linear')
++            self.assertThat(linear.selectedIndex, Eventually(Equals(i)))
++
++        try:
++            #try finding the next item.
++            line = linear.select_single('Label', text='Line' + str(count + 1))
++            self.assertIsNone(line)
++        except:
++            pass
++
++    def test_picker_circular_picker(self):
++        """Testing the circular picker"""
++
++        circular = self.getObject('picker_circular')
++        self.assertThat(circular.circular, Equals(True))
++        selectedIndex = circular.selectedIndex
++        #it seems picker needs some time to move to seletected index
++        #this requires uses of wait_select_single method in autopilot
++        #At time of writing this test, method is in trunk but not yet released.
++        #So I am looping it here to mimick the wait and will update
++        #once autopilot wait_select_single method becomes available.
++        for i in range(0, 10):
++            try:
++                line = circular.select_single('Label',
++                                              text='Line '
++                                              + str(selectedIndex))
++                self.assertIsNotNone(line)
++            except:
++                sleep(1)
++
++        self.pointing_device.click_object(line)
++
++        pathview = circular.select_single('QQuickPathView')
++        self.assertIsNotNone(pathview)
++        count = pathview.count
++        direction_to_move = (Direction.BACKWARD
++                             if selectedIndex <= count / 2
++                             else Direction.FORWARD)
++
++        #Test logic should be independent of test data but it doesn't
++        #look possible here, so have to rely on test data values in list
++        if direction_to_move == Direction.BACKWARD:
++            for i in range(selectedIndex, -2, -1):
++                line = circular.select_single('Label',
++                                              text='Line ' + str(i % count))
++                self.assertIsNotNone(line)
++                self.pointing_device.click_object(line)
++                self.assertThat(circular.selectedIndex,
++                                Eventually(Equals(i % count)))
++        else:
++            for i in range(selectedIndex, count + 2):
++                line = circular.select_single('Label',
++                                              text='Line ' + str(i % count))
++                self.assertIsNotNone(line)
++                self.pointing_device.click_object(line)
++                self.assertThat(circular.selectedIndex,
++                                Eventually(Equals(i % count)))
++
++    def test_picker_infinite_picker(self):
++        """Testing the infinite picker"""
++
++        infinite = self.getObject('picker_infinite')
++        self.assertThat(infinite.circular, Equals(False))
++
++        #Flick upward to reveal the hidden ui element.
++        flickable = self.main_view.select_single('QQuickFlickable')
++        self.assertIsNotNone(flickable)
++        self.reveal_item_by_flick(infinite, flickable, FlickDirection.UP)
++        self.assertThat(flickable.flicking, Eventually(Equals(False)))
++
++        listview = infinite.select_single('QQuickListView')
++        self.assertIsNotNone(listview)
++        count = listview.count
++        for i in range(0, count + 10):
++            line = infinite.select_single('Label', text='Line ' + str(i))
++            self.assertIsNotNone(line)
++            self.pointing_device.click_object(line)
++            infinite = self.getObject('picker_infinite')
++            self.assertThat(infinite.selectedIndex, Eventually(Equals(i)))

Ubuntu UI Toolkit

Merge lp:~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers