Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper into lp:ubuntu-ui-toolkit/staging

fix1340227-expandable_autopilot_helper
Merge into staging

Proposed by Leo Arias on 2014-10-01

Status:

Merged

Approved by:

Cris Dywan on 2014-10-22

Approved revision:

1277

Merged at revision:

1304

Proposed branch:

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

235 lines (+173/-16)

3 files modified

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py (+42/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml (+66/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py (+65/-16)

To merge this branch:

bzr merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-22
Cris Dywan		2014-10-01	Approve on 2014-10-22
Thomi Richards (community)		2014-10-02	Approve on 2014-10-07
Review via email: mp+236770@code.launchpad.net

Commit message

Added an autopilot helper for expandable list items.

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper updated on 2014-10-01

1273. By Leo Arias on 2014-10-01: Reverted indentation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1082/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper updated on 2014-10-01

1274. By Leo Arias on 2014-10-01: Added the missing file.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-01:

PASSED: Continuous integration, rev:1274
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1085/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/917
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6650
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14028

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1085/rebuild

review: Approve (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-10-07:

LGTM

review: Approve

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper updated on 2014-10-10

1275. By Leo Arias on 2014-10-10: Merged with staging.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1134/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper updated on 2014-10-21

1276. By Leo Arias on 2014-10-21: Merged with staging.

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-10-21:

17 + logger.debug('The item is already expanded.')
33 + logger.debug('The item is already collapsed.')

These should either be exceptions or go away - if we don't want to care about already expanded/ collpased cases there's no need to bloat the log.

review: Needs Fixing

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1152/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper updated on 2014-10-22

1277. By Leo Arias on 2014-10-22: Added comments for the two new methods.

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-10-22:

Thank you for adding the documentation! As clarified in a face to face discussion this is indeed consistent with existing API, I was being confused by similarly but differently behaving API, so hopefully documentation can mitigate this whilst we're establishing a convention.

review: Approve

Revision history for this message

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

review: Approve (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1156/rebuild

review: Needs Fixing (continuous-integration)

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:

Canonical Platform QA Team

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py'
 --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-06-16 21:26:30 +0000
 +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-10-22 19:20:56 +0000
@@ -108,6 +108,48 @@
      pass
++class Expandable(Empty):
++
++    @autopilot_logging.log_action(logger.info)
++    def expand(self):
++        """Expand an expandable list item.
++
++        If the item is already expanded, no action will be executed.
++        If you want to check if the item is expanded, you can use the
++        ``expanded`` property.
++
++        """
++        if not self.expanded:
++            self._click_always_visible_section()
++            self.expanded.wait_for(True)
++            self.height.wait_for(self.expandedHeight)
++        else:
++            logger.debug('The item is already expanded.')
++
++    @autopilot_logging.log_action(logger.debug)
++    def _click_always_visible_section(self):
++        self.pointing_device.move(
++            self.globalRect.x + self.globalRect.width // 2,
++            self.globalRect.y + self.collapsedHeight // 2)
++        self.pointing_device.click()
++
++    @autopilot_logging.log_action(logger.info)
++    def collapse(self):
++        """Collapse an expandable list item.
++
++        If the item is already collapsed, no action will be executed.
++        If you want to check if the item is expanded, you can use the
++        ``expanded`` property.
++
++        """
++        if self.expanded:
++            self._click_always_visible_section()
++            self.expanded.wait_for(False)
++            self.height.wait_for(self.collapsedHeight)
++        else:
++            logger.debug('The item is already collapsed.')
++
++
  class Standard(Empty):
      pass
 === added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml'
 --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml	2014-10-22 19:20:56 +0000
@@ -0,0 +1,66 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 0.1
++
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++
++
++    Column {
++        anchors.fill: parent
++
++        Repeater {
++            model: 2
++            Expandable {
++                id: expandingItem
++                objectName: "expandable" + index
++                expandedHeight: contentCol.height + units.gu(1)
++
++                onClicked: {
++                    expanded = !expanded;
++                }
++
++                Column {
++                    id: contentCol
++                    anchors { left: parent.left; right: parent.right }
++                    Item {
++                        anchors { left: parent.left; right: parent.right}
++                        height: expandingItem.collapsedHeight
++                        Label {
++                            anchors {
++                                left: parent.left
++                                right: parent.right
++                                verticalCenter: parent.verticalCenter
++                            }
++                            text: "Item " + index
++                        }
++                    }
++
++                    UbuntuShape {
++                        objectName: "shape" + index
++                        anchors { left: parent.left; right: parent.right }
++                        height: units.gu(6)
++                    }
++                }
++            }
++        }
++    }
++}
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-06-12 22:56:48 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-10-22 19:20:56 +0000
@@ -14,15 +14,43 @@
  # 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/>.
++try:
++    from unittest import mock
++except ImportError:
++    import mock
++
  import logging
++import os
  import fixtures
++import testtools
  from testtools.matchers import Contains
  import ubuntuuitoolkit
  from ubuntuuitoolkit import listitems, tests
++class ListItemsTestCase(testtools.TestCase):
++
++    def test_supported_class(self):
++        self.assertTrue(issubclass(
++            listitems.Base, listitems.Empty))
++        self.assertTrue(issubclass(
++            listitems.Expandable, listitems.Empty))
++        self.assertTrue(issubclass(
++            listitems.ItemSelector, listitems.Empty))
++        self.assertTrue(issubclass(
++            listitems.Standard, listitems.Empty))
++        self.assertTrue(issubclass(
++            listitems.SingleControl, listitems.Empty))
++        self.assertTrue(issubclass(
++            listitems.MultiValue, listitems.Base))
++        self.assertTrue(issubclass(
++            listitems.SingleValue, listitems.Base))
++        self.assertTrue(issubclass(
++            listitems.Subtitled, listitems.Base))
++
++
  class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
      test_qml = ("""
@@ -97,22 +125,6 @@
              listitems.Standard, objectName='listitem_standard')
          self.assertTrue(self._item.exists())
--    def test_supported_class(self):
--        self.assertTrue(issubclass(
--            listitems.Base, listitems.Empty))
--        self.assertTrue(issubclass(
--            listitems.ItemSelector, listitems.Empty))
--        self.assertTrue(issubclass(
--            listitems.Standard, listitems.Empty))
--        self.assertTrue(issubclass(
--            listitems.SingleControl, listitems.Empty))
--        self.assertTrue(issubclass(
--            listitems.MultiValue, listitems.Base))
--        self.assertTrue(issubclass(
--            listitems.SingleValue, listitems.Base))
--        self.assertTrue(issubclass(
--            listitems.Subtitled, listitems.Base))
--
      def test_standard_custom_proxy_object(self):
          self.assertIsInstance(self._item, listitems.Standard)
@@ -185,3 +197,40 @@
              objectName='listitem_destroyed_on_remove_without_confirm')
          item.swipe_to_delete()
          self.assertFalse(item.exists())
++
++
++class ExpandableTestCase(tests.QMLFileAppTestCase):
++
++    path = os.path.abspath(__file__)
++    dir_path = os.path.dirname(path)
++    test_qml_file_path = os.path.join(
++        dir_path, 'test_listitems.ExpandableTestCase.qml')
++
++    def setUp(self):
++        super(ExpandableTestCase, self).setUp()
++        self.test_expandable = self.main_view.select_single(
++            listitems.Expandable, objectName='expandable0')
++
++    def test_expand_item(self):
++        self.test_expandable.expand()
++        self.assertTrue(self.test_expandable.expanded)
++
++    def test_expand_already_expanded_item_must_do_nothing(self):
++        self.test_expandable.expand()
++
++        # Replace the pointer with None, so we make sure it's not being called.
++        with mock.patch.object(self.test_expandable, 'pointing_device', None):
++            self.test_expandable.expand()
++
++    def test_collapse_item(self):
++        self.test_expandable.expand()
++
++        self.test_expandable.collapse()
++        self.assertFalse(self.test_expandable.expanded)
++
++    def test_collapse_already_collapsed_item_must_do_nothing(self):
++        self.test_expandable.collapse()
++
++        # Replace the pointer with None, so we make sure it's not being called.
++        with mock.patch.object(self.test_expandable, 'pointing_device', None):
++            self.test_expandable.collapse()

Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers