Unity 8

Merge lp:~om26er/unity8/add_searchIndicator_test into lp:unity8

  1. add_searchIndicator_test
  2. Merge into trunk
Proposed by Omer Akram
Status: Merged
Approved by: Michał Sawicz
Approved revision: 484
Merged at revision: 498
Proposed branch: lp:~om26er/unity8/add_searchIndicator_test
Merge into: lp:unity8
Diff against target: 44 lines (+24/-0)
2 files modified
tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml (+1/-0)
tests/qmltests/tst_Shell.qml (+23/-0)
To merge this branch: bzr merge lp:~om26er/unity8/add_searchIndicator_test
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+192647@code.launchpad.net

Commit message

test: make sure the search indicator hides when an app has focus

Description of the change

test: make sure the search indicator hides when an app has focus

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Thanks a lot Omer!

One comment: I think you should close the app again at the end of your test in order to restore a clean environment for the following tests. In qmltests, all the test functions within one TestCase {} are executed in a single run (this is different from autopilot). Right now the subsequent tests don't seem to care about the fact that there is a running app. But if someone adds a new one that does, it's confusing to figure the test function which messes up.

review: Needs Fixing
Revision history for this message
Omer Akram (om26er) wrote :

now added cleanup() and also added a new test to make sure the search indicator is not visible while greeter is shown

Revision history for this message
Michael Zanetti (mzanetti) wrote :

yay! Thanks a bunch Omer.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/unity8-ci/1493/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/89/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/90
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/89
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2717
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2768/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/484
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/467

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1493/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/645/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/3095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/433
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/31
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/445
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/433
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3091
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1058

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/unity8-ci/1579/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/452
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/440
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3096
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1066

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1579/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml'
2--- tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml 2013-10-14 11:09:39 +0000
3+++ tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml 2013-10-25 11:25:12 +0000
4@@ -226,6 +226,7 @@
5 verify(fakeRunningAppsModel.contains("calendar"))
6
7 mouseClick(calendarTileCloseButton, calendarTileCloseButton.width/2, calendarTileCloseButton.height/2)
8+ wait(0) // spin event loop to start any pending animation
9
10 verify(!fakeRunningAppsModel.contains("calendar"))
11
12
13=== modified file 'tests/qmltests/tst_Shell.qml'
14--- tests/qmltests/tst_Shell.qml 2013-10-09 20:01:12 +0000
15+++ tests/qmltests/tst_Shell.qml 2013-10-25 11:25:12 +0000
16@@ -483,5 +483,28 @@
17 var dash = findChild(shell, "dash");
18 tryCompare(dash, "shown", data.expectedShown);
19 }
20+
21+ function test_searchIndicatorHidesOnAppFocus() {
22+ var searchIndicator = findChild(shell, "container")
23+ tryCompare(searchIndicator, "opacity", 1)
24+ dragLauncherIntoView();
25+
26+ // Launch an app from the launcher
27+ tapOnAppIconInLauncher();
28+ waitUntilApplicationWindowIsFullyVisible();
29+
30+ tryCompare(searchIndicator, "opacity", 0);
31+ }
32+
33+ function test_searchIndicatorHidesOnGreeterShown() {
34+ var searchIndicator = findChild(shell, "container")
35+ var greeter = findChild(shell, "greeter");
36+
37+ tryCompare(searchIndicator, "opacity", 1)
38+
39+ greeter.show()
40+ tryCompare(greeter, "shown", true)
41+ tryCompare(searchIndicator, "opacity", 0)
42+ }
43 }
44 }

Subscribers

People subscribed via source and target branches