Ubuntu UI Toolkit

Merge lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker into lp:ubuntu-ui-toolkit

autopilot-emulator-Picker
Merge into trunk

Proposed by Chris Gagnon on 2013-10-22

Status:	Rejected
Rejected by:	Tim Peeters on 2014-07-15
Proposed branch:	lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	211 lines (+193/-0) 2 files modified tests/autopilot/ubuntuuitoolkit/emulators.py (+64/-0) tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+129/-0)
To merge this branch:	bzr merge lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Tim Peeters		2013-10-22	Needs Resubmitting on 2014-07-15
PS Jenkins bot	continuous-integration	2013-10-22	Approve on 2013-11-17
Chris Gagnon (community)			Needs Resubmitting on 2013-10-22
Leo Arias (community)	code review	2013-10-22	Needs Fixing on 2013-10-22
I Ahmad		2013-10-22	Pending
Review via email: mp+192161@code.launchpad.net

Commit message

picker emulator for autopilot

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

review: Needs Fixing (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-22:

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

review: Approve (continuous-integration)

lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker updated on 2013-10-22

805. By Tim Peeters on 2013-10-22

Initially show toolbar, but automatically hide after timeout. Fixes: https://bugs.launchpad.net/bugs/1207369.

Approved by Christian Dywan, PS Jenkins bot.

Revision history for this message

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

21 + """returns a list of buttons that can be picked
22 + :parameter opacity: buttons at or < the opacity will not be returned"""

According to pep257, it shoud be "Return" instead of "returns", and it recommends to put the closing """ on its own line.

I hate that we are using the opacity instead of something like (element.visible and element.enabled). I know you are just following the convention devs are using, but I'm wondering if you guys agree with me here. Should we start a discussion about this with the devs?

28 + def get_pickable_text(self, opacity=.25):

Shouldn't it be get_pickable_texts or get_pickable_text_list ?

38 + def get_pick_abstractbutton_from_text(self, text):
76 + def select_pick_text(self, text, opacity=.25):

Just like on the previous branch comment, I would just like to know if it's possible to assign an object name to the abstract button, so we don't have to work with text.

63 + return 'Can only be used on Desktop!'
74 + return "Can only be used on Desktop!"

I'll review the tests tomorrow, because I'm close to EOD today.

This should raise an exception.

review: Needs Fixing (code review)

Revision history for this message

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

> I hate that we are using the opacity instead of something like (element.visible and element.enabled).

no if the parent is visible then the child object is visible in QML. maybe a adding a hidden property?

> Shouldn't it be get_pickable_texts or get_pickable_text_list

it's get_pickable_text_list now

>assign an object name to the abstract button, so we don't have to work with text.

How do you know what the item that you want to pick will be? it seems like getting a pick from the text in the pick is something people will want in an emulator. the pick text might be created programatically, it seems like double the code to add an objectName to every item in a listview. If you hate text use the index?

review: Needs Resubmitting

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

review: Needs Fixing (continuous-integration)

lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker updated on 2013-11-14

806. By Timo Jyrinki on 2013-10-23

Partially revert bzr802 that deleted changelog entries, preventing building.

807. By Launchpad Translations on behalf of ubuntu-sdk-team on 2013-10-25

Launchpad automatic translations update.

808. By Tim Peeters on 2013-10-25

Put tab bar in selection mode when apps are launched. Fixes: https://bugs.launchpad.net/bugs/1223597.

Approved by PS Jenkins bot, Tim Peeters, Zsombor Egri.

809. By Cris Dywan on 2013-10-28

Support checkbox used with an action.

Approved by PS Jenkins bot, Zsombor Egri.

810. By Renato Araujo Oliveira Filho on 2013-10-28

Implemented emulator for swipe to remove. Fixes: https://bugs.launchpad.net/bugs/1236464.

Approved by PS Jenkins bot, Olivier Tilloy, Leo Arias.

811. By Zsombor Egri on 2013-10-31

Warnings treated as errors in all types of builds (debug or release). Fixes: https://bugs.launchpad.net/bugs/1246290.

Approved by PS Jenkins bot, Christian Dywan.

812. By Cris Dywan on 2013-10-31

Install autopilot modules in qmake not debian packaging.

Approved by PS Jenkins bot, Tim Peeters.

813. By Cris Dywan on 2013-10-31

Drop the $$ from system calls where output isn't needed.

Approved by PS Jenkins bot, Tim Peeters.

814. By Zsombor Egri on 2013-11-01

Introducing topmostItem property to drive whether InverseMouseArea should filter sensingArea events or to stay in the normal z-order/stack order of its parent. Fixes: https://bugs.launchpad.net/bugs/1240460.

Approved by PS Jenkins bot, Christian Dywan.

815. By Launchpad Translations on behalf of ubuntu-sdk-team on 2013-11-02

Launchpad automatic translations update.

816. By Cris Dywan on 2013-11-04

Look for locale folder as per XDG basedir spec and rewrite test

The new test case covers the whole range of changing languages,
checking the strings from both QML and C++ and binding to a folder. Fixes: https://bugs.launchpad.net/bugs/1175726, https://bugs.launchpad.net/bugs/1233071.

Approved by PS Jenkins bot, Tim Peeters.

817. By Cris Dywan on 2013-11-04

Define window within OrientationHelper to avoid a race condition. Fixes: https://bugs.launchpad.net/bugs/1239760.

Approved by PS Jenkins bot.

818. By Leo Arias on 2013-11-04

Added the change_state method to the CheckBox autopilot emulator.
Cleaned up the autopilot gallery toggles tests.

Approved by PS Jenkins bot, Chris Gagnon, Zoltan Balogh.

819. By Tim Peeters on 2013-11-04

Close tabbar and toolbar when user interacts with app contents. Fixes: https://bugs.launchpad.net/bugs/1223604.

Approved by Christian Dywan, PS Jenkins bot, Tim Peeters.

820. By Leo Arias on 2013-11-05

Added the objectNames to the ComposerSheet buttons. Fixes: https://bugs.launchpad.net/bugs/1244518.

Approved by PS Jenkins bot, Tim Peeters.

821. By PS Jenkins bot on 2013-11-05

Releasing 0.1.46+14.04.20131105.1-0ubuntu1 (revision 820 from lp:ubuntu-ui-toolkit).

Approved by PS Jenkins bot.

822. By Leo Arias on 2013-11-06

Update the tests to work with autopilot 1.4.

Approved by PS Jenkins bot, Chris Gagnon.

823. By PS Jenkins bot on 2013-11-06

Releasing 0.1.46+14.04.20131106-0ubuntu1 (revision 822 from lp:ubuntu-ui-toolkit).

Approved by PS Jenkins bot.

824. By Leo Arias on 2013-11-06

Add a check for the autopilot version on the emulator init. Fixes: https://bugs.launchpad.net/bugs/1248570.

Approved by PS Jenkins bot, Christian Dywan.

825. By Nicolas d'Offay on 2013-11-08

Reverted API break on the selectors. Fixes: https://bugs.launchpad.net/bugs/1248646.

Approved by Tim Peeters, Timo Jyrinki, PS Jenkins bot.

826. By Tim Peeters on 2013-11-08

Ensure the toolbar is opened when clicking a toolbar in autopilot tests. Fixes: https://bugs.launchpad.net/bugs/1248487.

Approved by PS Jenkins bot, Leo Arias.

827. By Tim Peeters on 2013-11-08

before fixing the actual bug, the test gives me these errors:

QWARN : tst_MainView::testNoWarnings_bug186065() unity::action::ActionManager::ActionManager(QObject*):
Could not determine application identifier. HUD will not work properly.
Provide your application identifier in $APP_ID environment variable.
QWARN : tst_MainView::testNoWarnings_bug186065() file:///home/tim/dev/ubuntu-ui-toolkit/fix1244660/modules/Ubuntu/Components/MainView.qml:257: TypeError: Cannot call method 'hasOwnProperty' of null

** (process:27191): CRITICAL **: Unable to get session bus: Operation was cancelled
QWARN : tst_MainView::testNoWarnings_bug186065() Don't know how to handle 'QList<QQmlError>', use qRegisterMetaType to register it.
PASS : tst_MainView::testNoWarnings_bug186065()
PASS : tst_MainView::cleanupTestCase()
Totals: 8 passed, 0 failed, 0 skipped
********* Finished testing of tst_MainView *********

I get the same when I execute unit_x11/tst_orientation/tst_orientation:
QWARN : tst_OrientationTest::test_defaults() Don't know how to handle 'QList<QQmlError>', use qRegisterMetaType to register it.
PASS : tst_OrientationTest::test_defaults()

Should I execute the tests in a different way?. Fixes: https://bugs.launchpad.net/bugs/1244660.

Approved by PS Jenkins bot, Christian Dywan.

828. By Robert Bruce Park on 2013-11-08

829. By PS Jenkins bot on 2013-11-08

Releasing 0.1.46+14.04.20131108.3-0ubuntu1 (revision 828 from lp:ubuntu-ui-toolkit).

Approved by PS Jenkins bot.

830. By Robert Bruce Park on 2013-11-08

831. By Launchpad Translations on behalf of ubuntu-sdk-team on 2013-11-12

Launchpad automatic translations update.

832. By Timo Jyrinki on 2013-11-12

Releasing 0.1.46+14.04.20131108.4-0ubuntu1 (revision 830 from lp:ubuntu-ui-toolkit).

833. By Chris Gagnon on 2013-11-14

sync with trunk, update emulator to use arguements and keyword arguments, instead of text

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-07-15:

If this MR is still valid, please resubmit it for merging into our staging branch

review: Needs Resubmitting

Unmerged revisions

833. By Chris Gagnon on 2013-11-14: sync with trunk, update emulator to use arguements and keyword arguments, instead of text

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

Chris Gagnon

Jaroslavas Karmazinas

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-11-08 17:15:11 +0000
 +++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-11-14 00:05:24 +0000
@@ -465,6 +465,70 @@
                  format(self.objectName))
++class Picker(UbuntuUIToolkitEmulatorBase):
++    """Picker Autopilot emulator."""
++
++    def get_current_pick(self):
++        """Return current pick from picker"""
++        focused_abstract_button = self.select_single(
++            'AbstractButton', focus=True)
++        label = focused_abstract_button.select_single('Label')
++        return label
++
++    def _get_pickable(self, opacity=.25):
++        """Return a list of buttons that can be picked
++        :parameter opacity: buttons at or < the opacity will not be returned
++        """
++        buttons = self._get_abstract_buttons()
++        buttons_list = [
++            button for button in buttons if button.opacity > opacity]
++        return buttons_list
++
++    def get_pickable_text_list(self, opacity=.25):
++        """Return a list of text in AbstractButton that can be picked
++        :parameter opacity: buttons at or < the opacity will not be returned
++        """
++        buttons = self._get_pickable(opacity)
++        text_list = [button.select_single('Label').text for button in buttons]
++        return text_list
++
++    def _get_abstract_buttons(self):
++        return self.select_many('AbstractButton')
++
++    def get_abstractbutton(self, *args, **kwargs):
++        """Return pick AbstractButton from text"""
++        buttons = self._get_abstract_buttons()
++        for button in buttons:
++            try:
++                if button.select_single(*args, **kwargs):
++                    return button
++            except dbus.StateNotFoundError:
++                pass
++
++        raise ValueError(
++            "Could not find button args {} with kwargs {}"".".format(
++                args, kwargs.items(),
++            )
++        )
++
++    def select_pick(self, *args, **kwargs):
++        """Click/Tap the text in the picker, default opacity is opacity=.25
++        """
++        opacity = kwargs.get('opacity', .25)
++
++        button = self.get_abstractbutton(*args, **kwargs)
++        if button.opacity > opacity:
++            self.pointing_device.click_object(button)
++            button.focus.wait_for(True)
++        else:
++            raise ValueError(
++                'arg {} with kwargs {} is not visible!'.format(
++                    args,
++                    kwargs.items(),
++                )
++            )
++
++
  class Base(Empty):
      pass
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-11-08 17:15:11 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-11-14 00:05:24 +0000
@@ -690,3 +690,132 @@
          self._go_to_page1()
          self.main_view.go_back()
          self.assertEqual(self.header.title, 'Page 0')
++
++TEST_QML_PICKER_LINEAR = ("""
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.Pickers 0.1
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++    Picker {
++        objectName: "test_picker"
++        circular: false
++        model: ["Line1",
++                "Line2",
++                "Line3",
++                "Line4",
++                "Line5",
++                "Line6",
++                "Line7",
++                "Line8",
++                "Line9",
++                "Line10"]
++
++        delegate: PickerDelegate {
++            Label {
++                text: modelData
++                anchors.verticalCenter: parent.verticalCenter
++            }
++        }
++    }
++}
++""")
++
++TEST_QML_PICKER_CIRCULAR = ("""
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.Pickers 0.1
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++    Picker {
++        objectName: "test_picker"
++        circular: false
++        model: ["Line1",
++                "Line2",
++                "Line3",
++                "Line4",
++                "Line5",
++                "Line6",
++                "Line7",
++                "Line8",
++                "Line9",
++                "Line10"]
++
++        delegate: PickerDelegate {
++            Label {
++                text: modelData
++                anchors.verticalCenter: parent.verticalCenter
++            }
++        }
++    }
++}
++""")
++
++
++class PickerTestCase(tests.QMLStringAppTestCase):
++
++    scenarios = [
++        ('picker linear', dict(
++            test_qml=TEST_QML_PICKER_LINEAR)),
++        ('picker circular', dict(
++            test_qml=TEST_QML_PICKER_CIRCULAR)),
++    ]
++
++    def setUp(self):
++        super(PickerTestCase, self).setUp()
++        self.picker = self.main_view.select_single(
++            emulators.Picker, objectName='test_picker')
++
++    def test_current_pick(self):
++        """get_current_pick must return the default pick"""
++        self.assertEquals(self.picker.get_current_pick().text, 'Line1')
++
++    def test_select_pick(self):
++        """Must be to select a pick in picker based on args and kwargs"""
++        self.picker.select_pick('Label', text='Line2')
++        self.assertEquals(self.picker.get_current_pick().text, 'Line2')
++
++    def test_negative_select_text_does_not_exist(self):
++        """select_pick_text must return a value error if it does not exist"""
++        error = self.assertRaises(
++            ValueError, lambda: self.picker.select_pick(
++                'Label',
++                text='this should fail',
++                opacity=.25,
++                )
++            )
++        self.assertEqual(
++            error.message,
++            "Could not find button args ('Label',) with kwargs [('opacity',"
++            " 0.25), ('text', 'this should fail')]."
++        )
++
++    def test_negative_select_pick_not_visible(self):
++        """select_pick_text must return ValueError, if pick with text is hidden
++        """
++        error = self.assertRaises(
++            ValueError, lambda: self.picker.select_pick(
++                'Label',
++                text='Line5',
++                )
++            )
++        self.assertEqual(
++            error.message,
++            "arg ('Label',) with kwargs [('text', 'Line5')] is not visible!",
++        )
++
++    def test_get_pickable_text_list(self):
++        """returns a list of picks that are pickable"""
++        pickable = self.picker.get_pickable_text_list()
++        pickable.sort()
++        expected = ["Line1", "Line2", "Line3"]
++        self.assertEquals(pickable, expected)
++
++    def test_get_pickable_opacity(self):
++        pickable = self.picker.get_pickable_text_list(.99)
++        expected = ["Line1"]
++        self.assertEquals(pickable, expected)

Ubuntu UI Toolkit

Merge lp:~chris.gagnon/ubuntu-ui-toolkit/autopilot-emulator-Picker into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers