Ubuntu UI Toolkit

Merge lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom into lp:ubuntu-ui-toolkit

listview-scroll_to_bottom
Merge into trunk

Proposed by Leo Arias on 2014-01-17

Status:

Merged

Approved by:

Cris Dywan on 2014-02-24

Approved revision:

928

Merged at revision:

957

Proposed branch:

lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom

Merge into:

lp:ubuntu-ui-toolkit

Diff against target:

254 lines (+98/-84)

2 files modified

tests/autopilot/ubuntuuitoolkit/emulators.py (+73/-31)
tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+25/-53)

To merge this branch:

bzr merge lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)			Approve on 2014-02-25
Cris Dywan		2014-01-17	Approve on 2014-02-24
PS Jenkins bot	continuous-integration		Approve on 2014-02-22
Javier Collado		2014-01-17	Pending
Richard Huddie		2014-01-17	Pending
Víctor R. Ruiz		2014-01-17	Pending
Review via email: mp+202129@code.launchpad.net

Commit message

On the autopilot listview emulator, scroll to the bottom to try to find elements not yet created.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1602/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-01-17:

We can't just scroll to the bottom, because then the items on the top will not exists.
On this version, we are scrolling one 'page' at a time.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1603/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1604/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1605/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Javier Collado (javier.collado) wrote on 2014-01-20:

The code looks good, but still I'm not familiar enough with it, so I have a
couple of questions:

- My understanding is that the statements in test_emulators.py in "delegate"
  (line 193 in the MP) create the elements that were previously created
  manually. Is that correct? How come that there isn't any loop counter or
  anything? Does using just one number as in "%1" mean that only the elements
  from 0 to 9 will be created?

- The _is_element_clickable method seems to make sense, but it doesn't consider
  the x coordinate. If the element is wide enough I guess it might happen that
  its center in the y axis is visible, but not the center in the x axis. Maybe
  there's some assumption or precondition that I'm missing?

Revision history for this message

Leo Arias (elopio) wrote on 2014-01-20:

Thanks for reviewing Javier.
The changes on the delegate are pretty nice. I didn't know how to do that, but kalikiana gave me the code. You can do a loop by just using:
191 + model: 20
So elements from 0 to 19 are created.

About _is_element_clickable, you are right. I'm currently not taking care of horizontal scrolling. With vertical scrolling we solve most of the cases for current apps, but we'll need to add the other one soon. I'll make a comment and add a bug to implement it in a following branch.

For now, going back to work in progress as the drag in the phone is still to fast and is taking us further than we need. I have solved the slow drag in https://code.launchpad.net/~elopio/autopilot/fix1257055-slow_drag/+merge/202205 just waiting for thomi.

Revision history for this message

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

FAILED: Continuous integration, rev:927
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1758/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3067/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3069/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1758/rebuild

review: Needs Fixing (continuous-integration)

lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom updated on 2014-02-22

928. By Leo Arias on 2014-02-22: Fixed pyflakes.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1760/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-02-24:

Nice stuff!

review: Approve

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-02-25:

FAIL: ubuntu_rssreader_app.tests.test_rssreader.TestMainWindow.test_add_remove_feed_and_topic(with touch)
http://paste.ubuntu.com/6994140/

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-02-25:

> FAIL: ubuntu_rssreader_app.tests.test_rssreader.TestMainWindow.test_add_remove
> _feed_and_topic(with touch)
> http://paste.ubuntu.com/6994140/

After rerunning tests ubuntu_rssreader_app, everything passes:

CI@home OK http://paste.ubuntu.com/6994140/ + rerun http://paste.ubuntu.com/6994912/

review: Approve

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-27:

I'm improving this test_add_remove_feed_and_topic. It's ugly now, so you can expect to get random issues. Next week it will be pretty.

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

Jaroslavas Karmazinas

Leo Arias

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-01-30 15:26:21 +0000
 +++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-02-22 00:04:26 +0000
@@ -15,7 +15,6 @@
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
  import logging
--import time
  from distutils import version
  import autopilot
@@ -527,7 +526,7 @@
      def click_element(self, objectName):
          """Click an element from the list.
--        It swipes the element into view if it's not fully visible.
++        It swipes the element into view if it's center is not visible.
          :parameter objectName: The objectName property of the element to click.
@@ -537,38 +536,81 @@
          self.pointing_device.click_object(element)
      def _swipe_element_into_view(self, objectName):
--        element = self.select_single(objectName=objectName)
--        x, y, width, height = self.globalRect
--        start_x = x + (width / 2)
--        start_y = y + (height / 2)
++        element = self._select_element(objectName)
--        while not self._is_element_fully_visible(objectName):
--            stop_x = start_x
++        while not self._is_element_clickable(objectName):
              if element.globalRect.y < self.globalRect.y:
--                stop_y = start_y + element.implicitHeight
--            else:
--                stop_y = start_y - element.implicitHeight
--
--            if platform.model() == 'Desktop':
--                # The drag on the desktop is done two fast, so we are left at
--                # the bottom or at the top of the list, sometimes missing the
--                # element we are looking for.
--                # TODO: use the slow drag once it's implemented:
--                # https://bugs.launchpad.net/autopilot/+bug/1257055
--                # --elopio - 2014-01-09
--                self.pointing_device.move(start_x, start_y)
--                self.pointing_device.press()
--                self.pointing_device.move(stop_x, stop_y)
--                time.sleep(0.3)
--                self.pointing_device.release()
--            else:
--                self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--
--    def _is_element_fully_visible(self, objectName):
++                self._show_more_elements_above()
++            else:
++                self._show_more_elements_below()
++
++    def _select_element(self, object_name):
++        try:
++            return self.select_single(objectName=object_name)
++        except dbus.StateNotFoundError:
++            # If the list is big, elements will only be created when we scroll
++            # them into view.
++            self._scroll_to_top()
++            while not self.atYEnd:
++                self._show_more_elements_below()
++                try:
++                    return self.select_single(objectName=object_name)
++                except dbus.StateNotFoundError:
++                    pass
++            raise ToolkitEmulatorException(
++                'List element with objectName "{}" not found.'.format(
++                    object_name))
++
++    @autopilot_logging.log_action(logger.info)
++    def _scroll_to_top(self):
++        x, y, width, height = self.globalRect
++        while not self.atYBeginning:
++            self._show_more_elements_above()
++
++    @autopilot_logging.log_action(logger.info)
++    def _show_more_elements_below(self):
++        if self.atYEnd:
++            raise ToolkitEmulatorException('There are no more elements below.')
++        else:
++            self._show_more_elements('below')
++
++    @autopilot_logging.log_action(logger.info)
++    def _show_more_elements_above(self):
++        if self.atYBeginning:
++            raise ToolkitEmulatorException('There are no more elements above.')
++        else:
++            self._show_more_elements('above')
++
++    def _show_more_elements(self, direction):
++        x, y, width, height = self.globalRect
++        start_x = stop_x = x + (width / 2)
++        # Start and stop just a little under the top of the list.
++        top = y + 5
++        bottom = y + height - 5
++        if direction == 'below':
++            start_y = bottom
++            stop_y = top
++        elif direction == 'above':
++            start_y = top
++            stop_y = bottom
++        else:
++            raise ToolkitEmulatorException(
++                'Invalid direction {}.'.format(direction))
++        self._slow_drag(start_x, stop_x, start_y, stop_y)
++        self.dragging.wait_for(False)
++        self.moving.wait_for(False)
++
++    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
++        # If we drag too fast, we end up scrolling more than what we
++        # should, sometimes missing the  element we are looking for.
++        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
++
++    def _is_element_clickable(self, objectName):
++        """Return True if the center of the element is visible."""
          element = self.select_single(objectName=objectName)
--        return (element.globalRect.y >= self.globalRect.y and
--                element.globalRect.y + element.globalRect.height <=
--                self.globalRect.y + self.globalRect.height)
++        element_center = element.globalRect.y + element.globalRect.height / 2
++        return (element_center >= self.globalRect.y and
++                element_center <= self.globalRect.y + self.globalRect.height)
  class Empty(UbuntuUIToolkitEmulatorBase):
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-01-13 15:23:25 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-02-22 00:04:26 +0000
@@ -574,47 +574,6 @@
                  text: "No element clicked."
+             }
--            ListModel {
--                id: testModel
--
--                ListElement {
--                    objectName: "testListElement1"
--                    label: "test list element 1"
--                }
--                ListElement {
--                    objectName: "testListElement2"
--                    label: "test list element 2"
--                }
--                ListElement {
--                    objectName: "testListElement3"
--                    label: "test list element 3"
--                }
--                ListElement {
--                    objectName: "testListElement4"
--                    label: "test list element 4"
--                }
--                ListElement {
--                    objectName: "testListElement5"
--                    label: "test list element 5"
--                }
--                ListElement {
--                    objectName: "testListElement6"
--                    label: "test list element 6"
--                }
--                ListElement {
--                    objectName: "testListElement7"
--                    label: "test list element 7"
--                }
--                ListElement {
--                    objectName: "testListElement8"
--                    label: "test list element 8"
--                }
--                ListElement {
--                    objectName: "testListElement9"
--                    label: "test list element 9"
--                }
--            }
--
              ListView {
                  id: testListView
                  objectName: "testListView"
@@ -622,13 +581,13 @@
                  anchors.right: parent.right
                  height: column.height - clickedLabel.paintedHeight
                  clip: true
--                model: testModel
++                model: 20
                  delegate: ListItem.Standard {
--                    text: model.label
--                    objectName: model.objectName
--                    onClicked: clickedLabel.text = model.objectName
--                    height: units.gu(5)
++                        objectName: "testListElement%1".arg(index)
++                        text: "test list element %1".arg(index)
++                        onClicked: clickedLabel.text = objectName
++                        height: units.gu(5)
+                 }
+             }
+         }
@@ -648,32 +607,45 @@
          self.assertIsInstance(self.list_view, emulators.QQuickListView)
      def test_click_element(self):
--        self.list_view.click_element('testListElement1')
--        self.assertEqual(self.label.text, 'testListElement1')
++        self.list_view.click_element('testListElement0')
++        self.assertEqual(self.label.text, 'testListElement0')
      def test_click_element_outside_view_below(self):
          # Click the first element out of view to make sure we are not scrolling
          # to the bottom at once.
          self.assertFalse(
--            self.list_view._is_element_fully_visible('testListElement5'))
++            self.list_view._is_element_clickable('testListElement5'))
          self.list_view.click_element('testListElement5')
          self.assertEqual(self.label.text, 'testListElement5')
      def test_click_element_outside_view_above(self):
--        # First we need to scroll to the 8th element in order for the 9th to be
--        # created.
--        self.list_view.click_element('testListElement8')
          self.list_view.click_element('testListElement9')
          # Click the first element out of view to make sure we are not scrolling
          # to the top at once.
          self.assertFalse(
--            self.list_view._is_element_fully_visible('testListElement4'))
++            self.list_view._is_element_clickable('testListElement4'))
          self.list_view.click_element('testListElement4')
          self.assertEqual(self.label.text, 'testListElement4')
++    def test_click_element_not_created_at_start(self):
++        objectName = 'testListElement19'
++        self.assertRaises(
++            dbus.StateNotFoundError,
++            self.list_view.select_single,
++            objectName=objectName)
++        self.list_view.click_element(objectName)
++
++    def test_click_unexisting_element(self):
++        error = self.assertRaises(
++            emulators.ToolkitEmulatorException,
++            self.list_view.click_element,
++            'unexisting')
++        self.assertEqual(
++            str(error), 'List element with objectName "unexisting" not found.')
++
  class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):

Ubuntu UI Toolkit

Merge lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers