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

Status:	Work in progress
Proposed branch:	lp:~unity-team/ubuntu-ui-toolkit/fix-1242647
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	451 lines (+126/-72) 8 files modified CHANGES (+2/-0) components.api (+2/-0) examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+7/-11) modules/Ubuntu/Components/ListItems/ItemSelector.qml (+25/-5) modules/Ubuntu/Components/OptionSelector.qml (+34/-17) modules/Ubuntu/Components/OptionSelectorDelegate.qml (+20/-2) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+6/-5) tests/unit_x11/tst_components/tst_optionselector.qml (+30/-32)
To merge this branch:	bzr merge lp:~unity-team/ubuntu-ui-toolkit/fix-1242647
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-01-30	Needs Fixing on 2014-01-30
Tim Peeters		2014-01-30	Pending
Review via email: mp+203901@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-29: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-02: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:851
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1367/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1310/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1310/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-12-03: Posted in a previous version of this proposal

#

I've taken a different approach for this. Since there's no way to get a delegate's property, we're forced to use custom models to bind the 'selected' property to a role. I've illustrated how to use this to check/uncheck a delegate in a multiple choice selector. While I don't consider this the most ideal, QML doesn't currently support the alternative due to the aforementioned inability to get delegate properties which aren't roles.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-03: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:869
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1388/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1387/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1387/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1359/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-04: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:870
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1377/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/340/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/340/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1377/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-05: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:871
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1414/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1476/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1438/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1476/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1438/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-06: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:872
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1417/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1508/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1469/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1508/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1469/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-06: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1418/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1511/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1511/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1470/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-16: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:874
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1460/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1658/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1658/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-16: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-17: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:876
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1467/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1778
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1698/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/415
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/415/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1778
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1778/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1698
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1698/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4200/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2425

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-18: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:877
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1477/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1739/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1739/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

In OptionSelectors.qml, is it possible with the multiselection without custom model (objectName: "optionselector_multipleselection") to give the initial values of the options?

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

99 + if (typeof model.get === "function") {
100 + selected = model.get(i).selected;
101 + }

What happens if there is no "get" property (or function)? Will this give an error?
perhaps it should be:
if (model.hasOwnProperty("get") && (typeof model.get === "function")) {

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

(OptionSelectors.qml)

> onDelegateClicked: print("SELECTION ARRAY: " + isSelected(index));
> onDelegateClicked: print("SELECTED ROLE: " + isSelected(index));

The prints are a bit abstract, and it is not clear why you print two different things in onDelegateClicked.

I prefer something like this:
onDelegateClicked: print("Item "+index+" selected = "+isSelected(index))
in both cases.

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

200 + Is i of our model currently selected?

Is item i of our model currently selected?
(or option i)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

Can you check the initialization of your variables in tst_optionselector.qml?

So, add a function initTestCase() to the TestCase which is executed before all the other test.

expanded: false can be removed in "selector" because it is the default.

then, initTestCase() add tests to check the initial state of currentlyExpanded:
compare(selector.currentlyExpanded, false, "Selector is not expanded initially");
compare(multiSelector.currentlyExpanded, true, "Multi selector is always expanded");

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

267 + if (typeof listView.model.setProperty === "function") {

Same comment as before when using typeof. Do we need to check listView.model.hasOwnProperty("setProperty")?

review: Needs Information

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

266 + //Only update our selected model property if 'model' inherits from QAbstractListModel
267 + if (typeof listView.model.setProperty === "function") {
268 + listView.model.setProperty(index, "selected", selected);
269 + } else {
270 + //Sync the selections array which we can access to check our current selection.
271 + listView.selections[index] = selected;
272 + }

Please document this behavior. You can add to the description of the model of the OptionSelector/ItemSelector that if the model inherits from QAbstractListModel, then the setProperty() function will be called to update the selected property. If not, the OptionSelector keeps its own list of selections.

review: Needs Fixing

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-12-19: Posted in a previous version of this proposal

#

"What happens if there is no "get" property (or function)? Will this give an error?
perhaps it should be:"

No, it falls back to the array of selection values. I'll update the documentation accordingly.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

listview.selections is initialized as [], and then it is assigned values with selections[i] = value. It is never given a size, how can this work?

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

198 + /*!
199 + \preliminary
200 + Is i of our model currently selected?
201 + */
202 + function isSelected(i) {
203 + var selected = list.selections[i];
204 + if (typeof model.get === "function") {
205 + selected = model.get(i).selected;
206 + }
207 + return selected;
208 + }

I think it is cleaner if you put selected = list.selections[i] in an else { }, when the model does not have a get function.

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

Can you add a test that checks:

- An item in a multiselector is not selected
- Click the item
- the item is now selected (verify with isSelected(i)).

Revision history for this message

Tim Peeters (tpeeters) wrote on 2013-12-19: Posted in a previous version of this proposal

#

test_optionselector.py should not be removed, but fixed.

review: Needs Fixing

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-12-19: Posted in a previous version of this proposal

#

I'm going to be amending the current expanded test to include the multiple choice one. This already tests the functionality. I don't think we need to include an initTestCase().

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:879
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1486/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1863
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1780/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/434
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/434/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1863
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1863/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1780/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4272/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2527

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-12-19: Posted in a previous version of this proposal

#

"listview.selections is initialized as [], and then it is assigned values with selections[i] = value. It is never given a size, how can this work?"

Javascript can assign values to an empty array. This is evident when the values change and are printed out in the gallery example without the custom model.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:881
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1489/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1870
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1787/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/437
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/437/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1870
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1787/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4277/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2533

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:884
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1500/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1919
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1835/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/448/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1919/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1835/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4310/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2578

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-09: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:885
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1543/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2149
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2042/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/491
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/491/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2151
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2042
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2042/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4509/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2890

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-09: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:886
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1549/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2160
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2053/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/497
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/497/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2053
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2053/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4519/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2901

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-09: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-09: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-13: Posted in a previous version of this proposal

#

134 + property var selections: []

can you add a little comment here explaining where the property is is initialized and used?

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-13: Posted in a previous version of this proposal

#

388 + compare(multiSelector.expanded, false, "multi selector should be false on startup.")

you're checking the expanded property, but the text says "multi selector".

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-13: Posted in a previous version of this proposal

#

398 + function test_clicked_signal() {
399 + skip('FIXME: This test doesn\'t pass in CI')
400 + mouseClick(multiSelector, 100, 90, Qt.LeftButton);
401 + clickedSignal.wait();
402 + compare(multiSelector.isSelected(clickedSignal.signalArguments[0][0]), true);
403 +
404 + //Second option.
405 + mouseClick(multiSelector, 100, 90, Qt.LeftButton);
406 + clickedSignal.wait();
407 + //Did the second index get clicked?
408 + compare(multiSelector.isSelected(clickedSignal.signalArguments[1][0]), false);
409 + }
410 +

can you add a string saying what went wrong (if something went wrong) to the compare() calls?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

Unit tests pass, but I get a bunch of warnings: http://pastebin.ubuntu.com/6749934/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

112 + selected = list.selections[i]

add a ; in the end of the line

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

code looks good now, we only need to fix the tests (warnings locally, and one fail on jenkins)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

The warnings are caused by this bug:
https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1269019

Can be solved in a separate MR. Here it is sufficient to remove that extra delegate which is not necessary.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

The skip() call in the test is my only complain left, but it is already there in our trunk, so this is good to go. Let's see what jenkins says.

review: Approve

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

apps work on device (including ubuntu-system-settings), but phablet-test-run ubuntu_system_settings fails, see http://pastebin.ubuntu.com/6751103/

investigating..

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-01-14: Posted in a previous version of this proposal

#

> apps work on device (including ubuntu-system-settings), but phablet-test-run
> ubuntu_system_settings fails, see http://pastebin.ubuntu.com/6751103/
>
> investigating..

I get the same AP failures for ubuntu-system-settings immediately after installing the latest ubuntu-system image on maguro without installing custom versions of UITK. So the fails above are not caused by this MR.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-14: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-16: Posted in a previous version of this proposal

#

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:899
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1653/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2742/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2505/console

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

review: Needs Fixing (continuous-integration)

Reply

Ubuntu UI Toolkit

Merge lp:~unity-team/ubuntu-ui-toolkit/fix-1242647 into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers

 === modified file 'CHANGES'
 --- CHANGES	2013-12-05 14:54:53 +0000
 +++ CHANGES	2014-01-30 09:34:41 +0000
@@ -9,7 +9,9 @@
  API Changes
  ***********
++* ADDED IN: OptionSelector: function isSelected(i)
  * ADDED IN: PickerDelegate: readonly property Picker picker
++* ADDED IN: ItemSelector: function isSelected(i)
  * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
  * CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
  * ADDED IN: Action: property string iconName
 === modified file 'components.api'
 --- components.api	2013-12-17 14:05:43 +0000
 +++ components.api	2014-01-30 09:34:41 +0000
@@ -122,6 +122,7 @@
      readonly property real itemHeight
      signal delegateClicked(int index)
      signal expansionCompleted()
++    function isSelected(i)
  modules/Ubuntu/Components/ListItems/MultiValue.qml
  Base
      property variant values
@@ -196,6 +197,7 @@
      readonly property real itemHeight
      signal delegateClicked(int index)
      signal expansionCompleted()
++    function isSelected(i)
  modules/Ubuntu/Components/OptionSelectorDelegate.qml
  ListItem.Standard
      property string text
 === modified file 'examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
 --- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2013-12-02 14:03:16 +0000
 +++ examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2014-01-30 09:34:41 +0000
@@ -59,24 +59,20 @@
              OptionSelector {
                 objectName: "optionselector_custommodel"
--               text: i18n.tr("Custom Model")
++               text: i18n.tr("Custom Model Multiple Selection")
                  model: customModel
                  expanded: true
++                multiSelection: true
                  colourImage: true
--                delegate: selectorDelegate
--            }
--
--            Component {
--                id: selectorDelegate
--                OptionSelectorDelegate { text: name; subText: description; iconSource: image }
++                delegate: OptionSelectorDelegate { text: name; subText: description; iconSource: image; selected: selected }
+             }
              ListModel {
                  id: customModel
--                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png" }
--                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png" }
--                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png" }
--                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png" }
++                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png"; selected: true}
++                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png"; selected: false }
++                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png"; selected: true }
++                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png"; selected: false }
+             }
              OptionSelector {
 === modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
 --- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2013-12-05 17:00:33 +0000
 +++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-01-30 09:34:41 +0000
@@ -118,7 +118,8 @@
      /*!
        \preliminary
--      The list of values that will be shown under the label text. This is a model.
++      The list of values that will be shown under the label text. This is a model. If the selector is a multiple selection and this model doesn't inherit from QAbstractListModel
++      then we fall back to using an internal array of booleans to keep track of the selection.
       */
      property var model
@@ -182,7 +183,7 @@
      readonly property alias itemHeight: list.itemHeight
      /*!
--      Called when delegate is clicked.
++      Called when delegate is clicked. Parameters are the index clicked.
       */
      signal delegateClicked(int index)
@@ -191,6 +192,21 @@
       */
      signal expansionCompleted()
++    /*!
++      \preliminary
++      Is option i of our model currently selected?
++     */
++    function isSelected(i) {
++        var selected;
++        if (typeof model.get === "function") {
++            selected = model.get(i).selected;
++        } else {
++            selected = list.selections[i]
++        }
++
++        return selected;
++    }
++
      __height: column.height
      showDivider: false
@@ -223,7 +239,7 @@
                  left: parent.left
                  right: parent.right
+             }
--            state: itemSelector.expanded ? "expanded" : "collapsed"
++            state: itemSelector.expanded || itemSelector.multiSelection ? "expanded" : "collapsed"
              style: Theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
              states: [ State {
@@ -266,17 +282,21 @@
                  id: list
                  objectName: "listView"
++                property var selections: []
++
                  property int previousIndex: list.currentIndex
++                property real itemHeight
++
                  readonly property alias expanded: itemSelector.expanded
                  readonly property alias multiSelection: itemSelector.multiSelection
                  readonly property alias container: listContainer
--                property real itemHeight
++
                  signal delegateClicked(int index)
                  onDelegateClicked: itemSelector.delegateClicked(index);
                  interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
                  clip: true
--                currentIndex: 0
++                currentIndex: multiSelection ? -1 : 0
                  model: itemSelector.model
                  anchors.fill: parent
 === modified file 'modules/Ubuntu/Components/OptionSelector.qml'
 --- modules/Ubuntu/Components/OptionSelector.qml	2013-12-13 15:50:35 +0000
 +++ modules/Ubuntu/Components/OptionSelector.qml	2014-01-30 09:34:41 +0000
@@ -51,7 +51,6 @@
+             }
              OptionSelector {
--                objectName: "optionselector_multipleselection"
                  text: i18n.tr("Multiple Selection")
                  expanded: false
                  multiSelection: true
@@ -62,24 +61,20 @@
+             }
              OptionSelector {
--                text: i18n.tr("Label")
++                text: i18n.tr("Multiple Choice Custom Model")
                  model: customModel
                  expanded: true
                  colourImage: true
--                delegate: selectorDelegate
--            }
--
--            Component {
--                id: selectorDelegate
--                OptionSelectorDelegate { text: name; subText: description; iconSource: image }
++                multiSelection: true
++                delegate: OptionSelectorDelegate { text: name; subText: description; iconSource: image; selected: selected }
+             }
              ListModel {
                  id: customModel
--                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png" }
--                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png" }
--                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png" }
--                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png" }
++                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png"; selected: true}
++                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png"; selected: false }
++                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png"; selected: true }
++                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png"; selected: false }
+             }
              OptionSelector {
@@ -117,7 +112,8 @@
      /*!
        \preliminary
--      The list of values that will be shown under the label text. This is a model.
++      The list of values that will be shown under the label text. This is a model. If the selector is a multiple selection and this model doesn't inherit from QAbstractListModel
++      then we fall back to using an internal array of booleans to keep track of the selection.
       */
      property var model
@@ -181,7 +177,7 @@
      readonly property alias itemHeight: list.itemHeight
      /*!
--      Called when delegate is clicked.
++      Called when delegate is clicked. Parameters are the index clicked.
       */
      signal delegateClicked(int index)
@@ -190,6 +186,21 @@
       */
      signal expansionCompleted()
++    /*!
++      \preliminary
++      Is option i of our model currently selected?
++     */
++    function isSelected(i) {
++        var selected;
++        if (typeof model.get === "function") {
++            selected = model.get(i).selected;
++        } else {
++            selected = list.selections[i];
++        }
++
++        return selected;
++    }
++
       /*!
        \internal
        Trigger the action, passing the current index.
@@ -231,7 +242,7 @@
                  left: parent.left
                  right: parent.right
+             }
--            state: optionSelector.expanded ? "expanded" : "collapsed"
++            state: optionSelector.expanded || optionSelector.multiSelection ? "expanded" : "collapsed"
              style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
              states: [ State {
                      name: "expanded"
@@ -272,17 +283,23 @@
              ListView {
                  id: list
++                /*This array is initialised on an index by index basis in each OptionSelectorDelegate's onCompleted call.
++                Values are reset everytime a multiple choice selection is clicked.*/
++                property var selections: []
++
                  property int previousIndex: -1
++                property real itemHeight
++
                  readonly property alias expanded: optionSelector.expanded
                  readonly property alias multiSelection: optionSelector.multiSelection
                  readonly property alias container: listContainer
--                property real itemHeight
++
                  signal delegateClicked(int index)
                  onDelegateClicked: optionSelector.delegateClicked(index);
                  interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
                  clip: true
--                currentIndex: 0
++                currentIndex: multiSelection ? -1 : 0
                  model: optionSelector.model
                  anchors.fill: parent
 === modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
 --- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2013-12-04 15:51:58 +0000
 +++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-01-30 09:34:41 +0000
@@ -147,16 +147,26 @@
          left: parent.left
          right: parent.right
+     }
++
++    /*! \internal */
      onClicked: {
          if (listView.container.currentlyExpanded) {
--            listView.delegateClicked(index);
--
              if (!listView.multiSelection) {
++                //Set the current index which changes currentItem if multiple choice isn't active.
                  listView.previousIndex = listView.currentIndex;
                  listView.currentIndex = index;
              } else {
                  selected = !selected;
++                //Only update our selected model property if 'model' inherits from QAbstractListModel
++                if (typeof listView.model.setProperty === "function") {
++                    listView.model.setProperty(index, "selected", selected);
++                } else {
++                    //Sync the selections array which we can access to check our current selection.
++                    listView.selections[index] = selected;
++                }
+             }
++
++            listView.delegateClicked(index);
+         }
          if (!listView.expanded && !listView.multiSelection) {
@@ -165,6 +175,14 @@
+     }
      Component.onCompleted: {
++        if (listView.multiSelection) {
++            if (typeof listView.model.get === "function") {
++                selected = listView.model.get(index).selected;
++            } else {
++                listView.selections[index] = selected;
++            }
++        }
++
          height = listView.itemHeight = childrenRect.height;
+     }
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2013-11-08 09:19:02 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-01-30 09:34:41 +0000
@@ -81,16 +81,17 @@
          self.reveal_item_by_flick(custommodel, flickable, FlickDirection.UP)
          self.assertThat(flickable.flicking, Eventually(Equals(False)))
--        self.assertThat(custommodel.selectedIndex, Equals(0))
--        selectedValue = custommodel.select_single('Label', text='Name 4')
++        selectedValue = custommodel.select_single('OptionSelectorDelegate',
++                                                  text='Name 4')
          self.assertIsNotNone(selectedValue)
          self.pointing_device.click_object(selectedValue)
--        self.assertThat(custommodel.selectedIndex, Eventually(Equals(3)))
++        self.assertThat(selectedValue.selected, Eventually(Equals(True)))
--        selectedValue = custommodel.select_single('Label', text='Name 1')
++        selectedValue = custommodel.select_single('OptionSelectorDelegate',
++                                                  text='Name 1')
          self.assertIsNotNone(selectedValue)
          self.pointing_device.click_object(selectedValue)
--        self.assertThat(custommodel.selectedIndex, Eventually(Equals(0)))
++        self.assertThat(selectedValue.selected, Eventually(Equals(False)))
          #scroll the page downward now.
          collapsed = self.getObject("optionselector_collapsed")
 === modified file 'tests/unit_x11/tst_components/tst_optionselector.qml'
 --- tests/unit_x11/tst_components/tst_optionselector.qml	2013-12-18 12:40:20 +0000
 +++ tests/unit_x11/tst_components/tst_optionselector.qml	2014-01-30 09:34:41 +0000
@@ -33,9 +33,13 @@
              id: selector
              text: "TEST"
--            delegate: selectorDelegate
++            delegate: OptionSelectorDelegate {
++                text: name
++                subText: description
++                iconSource: image
++                constrainImage: true
++            }
              model: customModel
--            expanded: true
              action: {
                  enabled: true
@@ -45,24 +49,12 @@
+             }
+         }
--        OptionSelectorDelegate {
--            id: testDelegate
++        OptionSelector {
++            id: multiSelector
              text: "TEST"
--            subText: "test"
--            iconSource: "../../resources/optionselector/test.png"
--            constrainImage: true
--        }
--    }
--
--    Component {
--        id: selectorDelegate
--
--        OptionSelectorDelegate {
--            text: name
--            subText: description
--            iconSource: image
--            constrainImage: true
++            model: [1, 2, 3, 4]
++            multiSelection: true
+         }
+     }
@@ -76,7 +68,7 @@
      SignalSpy {
          id: clickedSignal
--        target: selector
++        target: multiSelector
          signalName: "delegateClicked"
+     }
@@ -99,7 +91,8 @@
           function test_expanded() {
               var listContainer = findChild(selector, "listContainer");
--             selector.expanded = false;
++             compare(multiSelector.expanded, false, "expanded should be false on startup.")
++
               compare(listContainer.currentlyExpanded, false, "expanded should be true if list is an expanded one");
               compare(listContainer.state, "collapsed", "state should be collapsed");
@@ -127,23 +120,28 @@
           function test_custom_model_delegate() {
               compare(selector.model, customModel, "Model wasn't set correctly.");
--             compare(selector.delegate, selectorDelegate, "Delegate hasn't been set correctly");
--         }
--
--         function test_image_constraint() {
--            var image = findChild(testDelegate, "icon");
--            compare(image.height, testDelegate.height);
--         }
--
--         function test_signal() {
--             skip('FIXME: This test doesn\'t pass in CI')
++         }
++
++         function test_clicked_signal() {
++             skip('FIXME: This test doesn\'t pass in CI. Passes locally for anyone who tried.')
++             mouseClick(multiSelector, 100, 100, Qt.LeftButton);
++             clickedSignal.wait();
++             compare(multiSelector.isSelected(clickedSignal.signalArguments[0][0]), true, "Clicked signal was not emitted and option was not selected.");
++
++             //Second option.
++             mouseClick(multiSelector, 100, 100, Qt.LeftButton);
++             clickedSignal.wait();
++             //Did the second index get clicked?
++             compare(multiSelector.isSelected(clickedSignal.signalArguments[1][0]), false, "Clicked signal was not emitted and option was not deselected.");
++         }
++
++         function test_expansion_signal() {
               mouseClick(selector, 100, 100, Qt.LeftButton);
--             clickedSignal.wait();
               expansionSignal.wait();
+          }
           function test_triggered() {
--             skip('FIXME: This test doesn\'t pass in CI')
++             skip('FIXME: This test doesn\'t pass in CI. Passes locally for anyone who tried.')
               mouseClick(selector, 100, 100, Qt.LeftButton);
               triggeredSignal.wait();
+          }