notes-app

Merge lp:~osomon/notes-app/swipe-to-delete-emulator into lp:notes-app

swipe-to-delete-emulator
Merge into trunk

Proposed by Olivier Tilloy on 2013-11-08

Status:	Merged
Approved by:	Ugo Riboni on 2013-11-19
Approved revision:	222
Merged at revision:	227
Proposed branch:	lp:~osomon/notes-app/swipe-to-delete-emulator
Merge into:	lp:notes-app
Diff against target:	89 lines (+11/-32) 2 files modified tests/autopilot/notes_app/emulators/notesapp.py (+2/-7) tests/autopilot/notes_app/tests/test_delete.py (+9/-25)
To merge this branch:	bzr merge lp:~osomon/notes-app/swipe-to-delete-emulator
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ugo Riboni (community)		2013-11-08	Approve on 2013-11-19
PS Jenkins bot	continuous-integration		Approve on 2013-11-19
Review via email: mp+194566@code.launchpad.net

Commit message

Use the standard UITK emulator for swipe-to-delete gesture and confirmation.

Description of the change

Note: this requires https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/fix-swipe_to_delete/+merge/194544 to be merged in the UITK as a prerequisite.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/259/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/260/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ugo Riboni (uriboni) wrote on 2013-11-19:

pass tests locally and code makes sense

review: Approve

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:

Olivier Tilloy

Ubuntu Phablet Team

 === modified file 'tests/autopilot/notes_app/emulators/notesapp.py'
 --- tests/autopilot/notes_app/emulators/notesapp.py	2013-11-07 17:34:00 +0000
 +++ tests/autopilot/notes_app/emulators/notesapp.py	2013-11-08 18:40:53 +0000
@@ -30,13 +30,8 @@
          parts.sort(key=lambda part: part.y)
          return parts
--    def get_note_delete_confirmation_button(self, note_item):
--        # XXX: this is highly unreliable, if the UITK implementation changes,
--        # this will break. Likewise, if NoteItems were to have more than one
--        # Row item at some point, it would break.
--        # This is a temporary solution until
--        # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1236464 is fixed.
--        return note_item.select_single("QQuickRow")
++    def get_note_listitem(self, note_item):
++        return note_item.select_single(uitk.Empty)
      def get_keyboard_rectangle(self):
          return self.select_single("KeyboardRectangle")
 === modified file 'tests/autopilot/notes_app/tests/test_delete.py'
 --- tests/autopilot/notes_app/tests/test_delete.py	2013-11-04 11:12:49 +0000
 +++ tests/autopilot/notes_app/tests/test_delete.py	2013-11-08 18:40:53 +0000
@@ -9,7 +9,7 @@
  from __future__ import absolute_import
--from testtools.matchers import Equals, GreaterThan, LessThan
++from testtools.matchers import Equals
  from autopilot.matchers import Eventually
  from notes_app.tests import NotesAppTestCase
@@ -40,33 +40,17 @@
      def test_slide_to_delete_right(self):
          note = self.main_window.get_notes()[0]
--
--        # Verify that sliding the note right removes the note
--        x, y, w, h = note.globalRect
--        ty = int(y + h / 2)
--        self.pointing_device.drag(int(x + 0.1 * w), ty, int(x + 0.9 * w), ty)
--        confirm = self.main_window.get_note_delete_confirmation_button(note)
--        xmax = note.globalRect[0] + note.globalRect[2] / 4
--        self.assertThat(lambda: confirm.globalRect[0],
--                        Eventually(LessThan(xmax)))
--        self.pointing_device.click_object(confirm)
--
++        listitem = self.main_window.get_note_listitem(note)
++        listitem.swipe_to_delete('right')
++        listitem.confirm_removal()
          self.assertThat(
              lambda: len(self.main_window.get_notes()), Eventually(Equals(0)))
      def test_slide_to_delete_left(self):
          note = self.main_window.get_notes()[0]
--
--        # Verify that sliding the note left removes the note
--        x, y, w, h = note.globalRect
--        ty = int(y + h / 2)
--        self.pointing_device.drag(int(x + 0.9 * w), ty, int(x + 0.1 * w), ty)
--        confirm = self.main_window.get_note_delete_confirmation_button(note)
--        xmin = note.globalRect[0] + note.globalRect[2] / 2
--        self.assertThat(lambda: confirm.globalRect[0],
--                        Eventually(GreaterThan(xmin)))
--        self.pointing_device.click_object(confirm)
--
++        listitem = self.main_window.get_note_listitem(note)
++        listitem.swipe_to_delete('left')
++        listitem.confirm_removal()
          self.assertThat(
              lambda: len(self.main_window.get_notes()), Eventually(Equals(0)))
@@ -81,7 +65,7 @@
              note_x + note_w / 2 + 10, note_y + note_h / 2)
          self.pointing_device.release()
--        self.app.select_single("Empty").swipingState.wait_for("")
++        self.main_window.get_note_listitem(note).swipingState.wait_for("")
          self.assertThat(
              lambda: len(self.main_window.get_notes()), Eventually(Equals(1)))
@@ -97,6 +81,6 @@
          self.pointing_device.move(note_x + note_w / 2, note_y + note_h / 2)
          self.pointing_device.release()
--        self.app.select_single("Empty").swipingState.wait_for("")
++        self.main_window.get_note_listitem(note).swipingState.wait_for("")
          self.assertThat(
              lambda: len(self.main_window.get_notes()), Eventually(Equals(1)))