Unity Home Scope

Merge lp://qastaging/~stolowski/unity-scope-home/phone-disable-filters into lp://qastaging/unity-scope-home

phone-disable-filters
Merge into trunk

Proposed by Paweł Stołowski on 2013-09-23

Status:

Merged

Approved by:

Francis Ginther on 2013-10-01

Approved revision:

183

Merged at revision:

174

Proposed branch:

lp://qastaging/~stolowski/unity-scope-home/phone-disable-filters

Merge into:

lp://qastaging/unity-scope-home

Diff against target:

954 lines (+519/-154)

13 files modified

configure.ac (+1/-1)
src/platform-info.vala (+14/-11)
src/scope-registry.vala (+2/-1)
src/scope.vala (+18/-6)
src/search-util.vala (+0/-11)
tests/fake-server/samples/remote-scopes-minimal.txt (+1/-0)
tests/unit/Makefile.am (+14/-3)
tests/unit/data/unity/scopes/masterscope_a.scope (+2/-2)
tests/unit/data/unity/scopes/masterscope_b.scope (+2/-2)
tests/unit/data/unity/scopes/more_suggestions.scope (+17/-0)
tests/unit/data/unity/scopes/reference.scope (+33/-0)
tests/unit/test-home-scope.vala (+221/-117)
tests/unit/test-utils.vala (+194/-0)

To merge this branch:

bzr merge lp://qastaging/~stolowski/unity-scope-home/phone-disable-filters

High

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-01
Michal Hruby (community)		2013-09-23	Approve on 2013-10-01
Review via email: mp+187021@code.qastaging.launchpad.net

Commit message

Disable filter updates if phone factor is not 'desktop'.

Description of the change

Disable filter updates if phone factor is not 'desktop' (i.e. currently displayed categores are not reflected in the filters of Home view). This is required because UI in Unity 8 support single selection filters only (any selection made by the user will narrow results to single category in Home).

In addition, sort scope registry by scope id to give more sensible default order on the phone, until real category sorting works there.

Revision history for this message

Michal Hruby (mhr3) wrote on 2013-09-23:

Could we see some tests for this? Not updating the filters seems a bit scary, does changing the query still reset them etc? Those things should be ensured by a test.

review: Needs Information

Revision history for this message

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

PASSED: Continuous integration, rev:170
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/91/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/55

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/91/rebuild

review: Approve (continuous-integration)

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2013-09-23:

> Could we see some tests for this? Not updating the filters seems a bit scary,
> does changing the query still reset them etc? Those things should be ensured
> by a test.

Right, that was a bug; fixed.

As much as I'd love to add a test for it, I don't see a way to do it with a reasonable amount of effort due to the number of prerequisites or mocks needed.

The point of this change is to disable updates of filters in the UI from the backend (which only Home Scope does). The logic that sets scopes to query from SSS recommendations, always-search scopes or default view stays.

Revision history for this message

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

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/92/rebuild

review: Approve (continuous-integration)

Revision history for this message

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

PASSED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/98/rebuild

review: Approve (continuous-integration)

Revision history for this message

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

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/99/rebuild

review: Approve (continuous-integration)

Revision history for this message

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

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/100/rebuild

review: Approve (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/65
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/65/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/101/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michal Hruby (mhr3) wrote on 2013-09-30:

222 + echo $(nodist_test_home_scope_SOURCES)

Would be nice to get rid of it :)

418 + Process.close_pid (server_pid);

I think this frees the handle on some systems, yet it's used later in stop(), fortunately it's a noop on linux, anyway, better remove it (or move to destructor to have super-clean code).

519 + var proxy = acquire_test_proxy (HOME_SCOPE_DBUS_NAME, HOME_SCOPE_DBUS_PATH);
520 + var channel_id = open_channel (proxy, ChannelType.GLOBAL, null);
521 +
522 + assert (channel_id != null);

Looks like something that should go into setup() + close_channel() in teardown().

80 + string? form_factor = scope_search.search_context.search_metadata.form_factor;

Micro-optimisation - turn this into unowned string.

I know this was a hard fight, but it really opens doors to have more thorough testing of the entire home-scope codebase... Well done! :)

review: Needs Fixing

Revision history for this message

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

PASSED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/66