Merge into trunk : fix-1236464 : Code : Ubuntu UI Toolkit

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-25
Olivier Tilloy (community)			Approve on 2013-10-14
Leo Arias (community)	autopilot code review		Approve on 2013-10-10
Ubuntu SDK team		2013-10-10	Pending
Review via email: mp+190496@code.launchpad.net

Revision history for this message

Leo Arias (elopio) wrote on 2013-10-10:

#

<elopio> renato_: I think it would be enough to test one of the objects that inherit from SwipeToDeleteTestCase, and then to test that all the emulators you added inherit from SwipeToDeleteTestCase.
<elopio> and that second test would be a little dumb, so I would just leave either the empty or the standard item on your test.
<elopio> renato_: every time you do select_single, and continue on the next line, you have a pep8 error there because of the extra space.
<elopio> so jenkins is going to reject your branch for that.
<elopio> renato_: you are missing some tests to cover all the possible flows:
<elopio> test_delete_item -> with default direction value
<elopio> test_delete_item_swiping_to_the_left
<elopio> test_delete_non_removable_item
<elopio> test_confirm_removal_when_item_was_not_swiped
<elopio> renato_: and I don't like this: 109␉+ self.implicitHeight.wait_for(0)
<elopio> if the dialog doesn't have a visible property that works, or an opened property or something like that, I think we should fix it to be
<elopio> self.visible.wait_for(False)
<elopio> I say "we" as in somebody who know how to do it, not me :)

Thank you for working on this!

review: Needs Fixing (code review)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-10

794. By Renato Araujo Oliveira Filho on 2013-10-10: Added more tests cases.
Fixed swipe to left.
795. By Renato Araujo Oliveira Filho on 2013-10-10: Reduce the qml example used for swipe to delete emulator test.

Revision history for this message

Leo Arias (elopio) wrote on 2013-10-10:

#

Looks really good. Thanks again.

review: Approve (autopilot code review)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-10

796. By Renato Araujo Oliveira Filho on 2013-10-10: Creeated setUp function to simplify the code.
797. By Renato Araujo Oliveira Filho on 2013-10-10: Used single quotes when possible.
798. By Renato Araujo Oliveira Filho on 2013-10-10: Moved setUp to the top of the class declaration.
799. By Renato Araujo Oliveira Filho on 2013-10-10: Removed white spaces.

Revision history for this message

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

#

FAILED: Continuous integration, rev:793
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/947/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/360/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4508/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2819/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

800. By Renato Araujo Oliveira Filho on 2013-10-11: Updated API changes related files.

Revision history for this message

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

#

FAILED: Continuous integration, rev:799
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/948/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4509/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2824/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:800
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/949/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2824/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4510/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2826/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

801. By Renato Araujo Oliveira Filho on 2013-10-11: Updated components.api.

Revision history for this message

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

#

FAILED: Continuous integration, rev:801
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/950/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/363/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2825/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/807/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/807/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4511/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2827/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

pep8 reports 22 errors.
pyflakes reports 2 errors.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

126 + if (direction == 'right'):
127 + self.pointing_device.drag(tx, ty, w, ty)
128 + else:
129 + self.pointing_device.drag(w, ty, x, ty)

The else clause should be an "elif (direction == 'left')", and you should add an additional else clause that raises some sort of exception if the value of direction is neither 'left' nor 'right'.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

116 + def _get_confirm_buttton(self):

Typo: there’s one t too many.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

148 +class Empty(UbuntuUIToolkitEmulatorBase, SupportsSwipeToDelete):
149 + pass
150 +
151 +class Base(UbuntuUIToolkitEmulatorBase, SupportsSwipeToDelete):
152 + pass
153 +
154 +class ItemSelector(UbuntuUIToolkitEmulatorBase, SupportsSwipeToDelete):
155 + pass
[…]

In QML, Base and ItemSelector inherit Empty, wouldn’t it be possible to make the emulator classes follow the same inheritance pattern? The same would apply for all emulators, e.g. MultiValue inherit from Base, and so on…

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

241 + def test_delete_item(self):
242 + self._item.swipe_to_delete('right')
243 + self._item.confirm_removal()
244 + self.assertEqual(self._item.implicitHeight, 0)

For completeness, this test should be duplicated to test the confirmation when swiped to the left.

review: Needs Fixing

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2013-10-11:

#

> 148 +class Empty(UbuntuUIToolkitEmulatorBase, SupportsSwipeToDelete):
> 149 + pass
> 150 +
> 151 +class Base(UbuntuUIToolkitEmulatorBase, SupportsSwipeToDelete):
> 152 + pass
> 153 +
> 154 +class ItemSelector(UbuntuUIToolkitEmulatorBase,
> SupportsSwipeToDelete):
> 155 + pass
> […]
>
> In QML, Base and ItemSelector inherit Empty, wouldn’t it be possible to make
> the emulator classes follow the same inheritance pattern? The same would apply
> for all emulators, e.g. MultiValue inherit from Base, and so on…

This is the way the quality guys told me to go, For some reason autopilot will get confused by using what you proposal.

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

802. By Renato Araujo Oliveira Filho on 2013-10-11: Fixed pep8 syntax.
803. By Renato Araujo Oliveira Filho on 2013-10-11: Fixed typo buttton
804. By Renato Araujo Oliveira Filho on 2013-10-11: Raise error when trying to swipe a item to invalid direction.

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2013-10-11:

#

> pep8 reports 22 errors.
> pyflakes reports 2 errors.

Fixed on rev: 802

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2013-10-11:

#

> 116 + def _get_confirm_buttton(self):
>
> Typo: there’s one t too many.

Fixed on rev: 803

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2013-10-11:

#

> 126 + if (direction == 'right'):
> 127 + self.pointing_device.drag(tx, ty, w, ty)
> 128 + else:
> 129 + self.pointing_device.drag(w, ty, x, ty)
>
> The else clause should be an "elif (direction == 'left')", and you should add
> an additional else clause that raises some sort of exception if the value of
> direction is neither 'left' nor 'right'.
Fixed rev: 804

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2013-10-11:

#

> 241 + def test_delete_item(self):
> 242 + self._item.swipe_to_delete('right')
> 243 + self._item.confirm_removal()
> 244 + self.assertEqual(self._item.implicitHeight, 0)
>
> For completeness, this test should be duplicated to test the confirmation when
> swiped to the left.
Fixed on rev 804

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

> > pep8 reports 22 errors.
> > pyflakes reports 2 errors.
>
> Fixed on rev: 802

I’m now seeing 3 pyflakes errors.

review: Needs Fixing

Revision history for this message

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

#

FAILED: Continuous integration, rev:804
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/960/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2848/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

805. By Renato Araujo Oliveira Filho on 2013-10-11: Fixed pyflakes errors.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

> > In QML, Base and ItemSelector inherit Empty, wouldn’t it be possible to make
> > the emulator classes follow the same inheritance pattern? The same would
> apply
> > for all emulators, e.g. MultiValue inherit from Base, and so on…
>
> This is the way the quality guys told me to go, For some reason autopilot will
> get confused by using what you proposal.

I find this awkward, and I don’t really understand why this would confuse autopilot. We’re talking about simple inheritance here. Can you please give it a shot?

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

806. By Renato Araujo Oliveira Filho on 2013-10-11: Use Empty as base class for swipe to delete emulator.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

SingleValue, MultiValue and Subtitled should inherit from Base, not from Empty.

review: Needs Fixing

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

807. By Renato Araujo Oliveira Filho on 2013-10-11: Fixed class inheritance

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-11:

#

The inheritance checks need to be updated in test_supported_class() too.

review: Needs Fixing

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-11

808. By Renato Araujo Oliveira Filho on 2013-10-11: Fixed test_supported_class to check the correct class.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-14:

#

Looks good to me now.

review: Approve

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-15

809. By Renato Araujo Oliveira Filho on 2013-10-15: Merged mainline.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-23

810. By Renato Araujo Oliveira Filho on 2013-10-23: Merged mainline.

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/1063/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:810
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1065/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/28/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/28/console
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/13/console
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/13/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/28/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/28/console

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

review: Needs Fixing (continuous-integration)

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/1067/rebuild

review: Needs Fixing (continuous-integration)

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/1070/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2013-10-24:

#

20:57:51.268 ERROR testresult:35 - FAIL: ubuntuuitoolkit.tests.test_emulators.SwipeToDeleteTestCase.test_swipe_item_to_left
AssertionError: After 10.0 seconds test on Standard.waitingConfirmationForRemoval failed: True != dbus.Boolean(False, variant_level=1)

lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 updated on 2013-10-24

811. By Renato Araujo Oliveira Filho on 2013-10-24: Attempt to fix the swipe to delete autopilot on device.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Ubuntu UI Toolkit

Merge lp:~renatofilho/ubuntu-ui-toolkit/fix-1236464 into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CHANGES'
 --- CHANGES	2013-10-18 02:41:30 +0000
 +++ CHANGES	2013-10-24 12:01:09 +0000
@@ -65,6 +65,8 @@
  * ADDED IN Panel: function open()
  * ADDED IN Panel: function close()
  * DEPRECATED IN Panel: writable property opened. Will be made read-only.
++* ADDED IN: Empty: property bool waitingConfirmationForRemoval
++* ADDED IN: Empty: function cancelItemRemoval()
  * CHANGED in CrossFadeImage: readonly property size sourceSize TO property size sourceSize
  Compatibility Breaks
 === modified file 'components.api'
 --- components.api	2013-10-18 14:41:53 +0000
 +++ components.api	2013-10-24 12:01:09 +0000
@@ -410,6 +410,7 @@
      property bool removable
      property bool confirmRemoval
      readonly property string swipingState
++    readonly property bool waitingConfirmationForRemoval
      signal itemRemoved
      property int __height
      property bool showDivider
@@ -418,6 +419,7 @@
      property list<Item> backgroundIndicator
      property ThinDivider divider
      property real __contentsMargins
++    function cancelItemRemoval()
  modules/Ubuntu/Components/ListItems/Header.qml
  Item
      property string text
 === modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
 --- modules/Ubuntu/Components/ListItems/Empty.qml	2013-10-04 19:07:26 +0000
 +++ modules/Ubuntu/Components/ListItems/Empty.qml	2013-10-24 12:01:09 +0000
@@ -109,6 +109,12 @@
       */
      readonly property alias swipingState: backgroundIndicator.state
++    /*!
++      \preliminary
++      \qmlproperty bool waitingConfirmationForRemoval
++      Defines if the item is waiting for the user interaction during the swipe to delete
++     */
++    readonly property alias waitingConfirmationForRemoval: confirmRemovalDialog.waitingForConfirmation
      /*!
        \preliminary
@@ -162,6 +168,15 @@
       */
      property real __contentsMargins: units.gu(2)
++    /*!
++      \preliminary
++      Cancel item romoval
++     */
++    function cancelItemRemoval()
++    {
++        priv.resetDrag()
++    }
++
      width: parent ? parent.width : units.gu(31)
      implicitHeight: priv.removed ? 0 : __height + bottomDividerLine.height
      __mouseArea.drag.axis: Drag.XAxis
@@ -218,6 +233,7 @@
              Resets the item dragging state
           */
          function resetDrag() {
++            confirmRemovalDialog.waitingForConfirmation = false
              body.x = 0
              pressedPosition = -1
              __mouseArea.drag.target = null
@@ -304,6 +320,7 @@
+                     }
                      ScriptAction {
                           script: {
++                             confirmRemovalDialog.waitingForConfirmation = true
                               priv.commitDrag()
+                         }
+                     }
@@ -333,9 +350,13 @@
              Item {
                  id: confirmRemovalDialog
++                objectName: "confirmRemovalDialog"
++
++                property bool waitingForConfirmation: false
                  visible: false
                  width: units.gu(15)
++                x: body.x - width - units.gu(2)
                  anchors {
                      top: parent.top
                      bottom: parent.bottom
@@ -374,6 +395,7 @@
+                 }
                  MouseArea {
++                    visible: confirmRemovalDialog.waitingForConfirmation
                      anchors.fill: parent
                      onClicked: removeItemAnimation.start()
+                 }
 === modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-18 09:37:13 +0000
 +++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-24 12:01:09 +0000
@@ -340,3 +340,71 @@
          if self.checked:
              self.pointing_device.click_object(self)
              self.checked.wait_for(False)
++
++
++class Empty(UbuntuUIToolkitEmulatorBase):
++    """Base class to emulate swipe to delete"""
++
++    def _get_confirm_button(self):
++        return self.select_single(
++            'QQuickItem', objectName='confirmRemovalDialog')
++
++    def swipe_to_delete(self, direction='right'):
++        """ Swipe the item in a specific direction """
++        if (self.removable):
++            x, y, w, h = self.globalRect
++            tx = x + (w / 8)
++            ty = y + (h / 2)
++
++            if (direction == 'right'):
++                self.pointing_device.drag(tx, ty, w, ty)
++            elif (direction == 'left'):
++                self.pointing_device.drag(w - (w*0.1), ty, x, ty)
++            else:
++                raise ToolkitEmulatorException(
++                    'Invalid direction "{0}" used on swipe to delete function'
++                    .format(direction))
++
++            self.waitingConfirmationForRemoval.wait_for(True)
++        else:
++            raise ToolkitEmulatorException(
++                'The item "{0}" is not removable'.format(self.objectName))
++
++    def confirm_removal(self):
++        """ Comfirm item removal if this was already swiped """
++        if (self.waitingConfirmationForRemoval):
++            deleteButton = self._get_confirm_button()
++            self.pointing_device.click_object(deleteButton)
++            self.implicitHeight.wait_for(0)
++        else:
++            raise ToolkitEmulatorException(
++                'The item "{0}" is not waiting for removal confirmation'.
++                format(self.objectName))
++
++
++class Base(Empty):
++    pass
++
++
++class Standard(Empty):
++    pass
++
++
++class ItemSelector(Empty):
++    pass
++
++
++class SingleControl(Empty):
++    pass
++
++
++class MultiValue(Base):
++    pass
++
++
++class SingleValue(Base):
++    pass
++
++
++class Subtitled(Base):
++    pass
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-18 14:41:53 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-24 12:01:09 +0000
@@ -458,6 +458,98 @@
          self.assertFalse(mock_click.called)
++class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
++
++    test_qml = ("""
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1
++
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(300)
++
++    Column {
++        width: parent.width
++
++        Standard {
++            objectName: "listitem_standard"
++            confirmRemoval: true
++            removable: true
++            width: parent.width
++            text: 'Slide to remove'
++        }
++        Empty {
++            objectName: "listitem_empty"
++            width: parent.width
++        }
++    }
++}
++""")
++
++    def setUp(self):
++        super(SwipeToDeleteTestCase, self).setUp()
++        self._item = self.main_view.select_single(
++            emulators.Standard, objectName='listitem_standard')
++
++    def test_supported_class(self):
++        self.assertTrue(issubclass(
++            emulators.Base, emulators.Empty))
++        self.assertTrue(issubclass(
++            emulators.ItemSelector, emulators.Empty))
++        self.assertTrue(issubclass(
++            emulators.Standard, emulators.Empty))
++        self.assertTrue(issubclass(
++            emulators.SingleControl, emulators.Empty))
++        self.assertTrue(issubclass(
++            emulators.MultiValue, emulators.Base))
++        self.assertTrue(issubclass(
++            emulators.SingleValue, emulators.Base))
++        self.assertTrue(issubclass(
++            emulators.Subtitled, emulators.Base))
++
++    def test_standard_emulator(self):
++        self.assertIsInstance(self._item, emulators.Standard)
++
++    def test_swipe_item(self):
++        self._item.swipe_to_delete()
++        self.assertTrue(self._item.waitingConfirmationForRemoval)
++
++    def test_swipe_item_to_right(self):
++        self._item.swipe_to_delete('right')
++        self.assertTrue(self._item.waitingConfirmationForRemoval)
++
++    def test_swipe_item_to_left(self):
++        self._item.swipe_to_delete('left')
++        self.assertTrue(self._item.waitingConfirmationForRemoval)
++
++    def test_swipe_item_to_wrong_direction(self):
++        self.assertRaises(
++            emulators.ToolkitEmulatorException,
++            self._item.swipe_to_delete, 'up')
++
++    def test_delete_item_moving_right(self):
++        self._item.swipe_to_delete('right')
++        self._item.confirm_removal()
++        self.assertEqual(self._item.implicitHeight, 0)
++
++    def test_delete_item_moving_left(self):
++        self._item.swipe_to_delete('left')
++        self._item.confirm_removal()
++        self.assertEqual(self._item.implicitHeight, 0)
++
++    def test_delete_non_removable_item(self):
++        self._item = self.main_view.select_single(
++            emulators.Empty, objectName='listitem_empty')
++        self.assertRaises(
++            emulators.ToolkitEmulatorException, self._item.swipe_to_delete)
++
++    def test_confirm_removal_when_item_was_not_swiped(self):
++        self.assertRaises(
++            emulators.ToolkitEmulatorException, self._item.confirm_removal)
++
++
  class PageStackTestCase(tests.QMLStringAppTestCase):
      test_qml = ("""