Merge lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests into lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell

Proposed by Ugo Riboni
Status: Merged
Approved by: Michał Sawicz
Approved revision: 937
Merged at revision: 921
Proposed branch: lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests
Merge into: lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 1073 lines (+812/-51)
20 files modified
CMakeLists.txt (+1/-0)
libunity-2d-private/Unity2d/plugin.cpp (+10/-0)
libunity-2d-private/src/CMakeLists.txt (+3/-0)
libunity-2d-private/src/inputshapemanager.cpp (+87/-0)
libunity-2d-private/src/inputshapemanager.h (+38/-0)
libunity-2d-private/src/inputshapemask.cpp (+88/-0)
libunity-2d-private/src/inputshapemask.h (+48/-0)
libunity-2d-private/src/inputshaperectangle.cpp (+86/-0)
libunity-2d-private/src/inputshaperectangle.h (+49/-0)
libunity-2d-private/src/unity2ddeclarativeview.cpp (+6/-0)
libunity-2d-private/src/unity2ddeclarativeview.h (+2/-0)
shell/MERGE-TODO (+0/-2)
shell/Shell.qml (+27/-1)
shell/app/shelldeclarativeview.cpp (+1/-46)
shell/app/shelldeclarativeview.h (+1/-1)
shell/dash/Home.qml (+1/-0)
tests/getshape/CMakeLists.txt (+22/-0)
tests/getshape/getshape.cpp (+102/-0)
tests/run-tests.rb (+1/-1)
tests/shell/input_shaping.rb (+239/-0)
To merge this branch: bzr merge lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+89236@code.qastaging.launchpad.net

Description of the change

[shell] Shape the shell window input according to what components are visible

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

* inputshapemask.cpp:19 always add a trailing slash to unity2dDirectory() as it doesn't do that internally (see bug 918669)
* one thing I'm afraid of: animating the launcher shape looks unnecessary and a resource drain, could we have just the "fully-on-screen" shape, enabled or disabled as soon as the launcher is supposed to be shown?
* unity2ddeclarativeview.cpp:161 any reason for the #include there?

927. By Michał Sawicz

Merge from shell

Revision history for this message
Michał Sawicz (saviq) wrote :

* getshape.cpp:72 unnecessary space before semicolon
* getshape.cpp maybe use QUrl::fromLocalFile / toLocalFile to handle things like ~?
* getshape.cpp doesn't seem to handle masks, just rectangles?
* input_shaping.rb:9 I'm sure Gerry will be pleased ;)
* input_shaping.rb:35 open_window_at has been refactored into a separate TmpWindow class, see autohide_show_tests.rb
* input_shaping.rb:68 maybe use a constant like other UNITY_2D_* do?, especially if #{pwd} is really $PWD
* input_shaping.rb:92 says "Launcher Autohide and Show Tests"
* input_shaping.rb:92 maybe abstract the constants to run-tests.rb? we do have the launcher width in launcher tests, too, might make sense to only have them in one place
* input_shaping.rb:94 DASH_HEIGHT_COLLAPSED looks unused?
* input_shaping.rb:128 says Launcher, should be Shell?
* input_shaping.rb:188 why D-Bus? do we actually need / want to expose that over D-Bus?

review: Needs Fixing
928. By Ugo Riboni

Fix minor style issue and make use of unity2dDirectory more robust

929. By Ugo Riboni

Don't animate the shape of the launcher

930. By Ugo Riboni

Add missing verification image

Revision history for this message
Gerry Boland (gerboland) wrote :

Please can you add a comment of the following form to each test case?:

# Test case objectives:
# * Check the Launcher position on Empty desktop
# Pre-conditions
# * Desktop with no running applications
# Test steps
# * Verify something
# * Click a button
# * Verify this happens
# Post-conditions
# * What non-unity2d thing should exist at test end
# References
# * None (lp bug number?)

This helps show what test cases need to be altered for future changes, and lets non-experts analyse the coverage of our test-suite.

And one more thing: "desktop_geometry" could be added to the Ruby XDo library

931. By Ugo Riboni

Fix style issues, use verify in tests and not assert, remove dead code, include shell tests in the global test run

932. By Ugo Riboni

Put back asserts in the utility functions as verify seems to work inside tests only

933. By Ugo Riboni

Ensure we're running a panel before the test battery starts. Fix some style issues.

934. By Ugo Riboni

Remove the test for same size before comparing images, and add return code check instead

935. By Ugo Riboni

Tap the button to close shortcuts instead of fiddling with internal variables

936. By Ugo Riboni

Put back the image size tests as they never hurt, and use verify_true to check the return of the compare_images

937. By Ugo Riboni

Wait a bit after simulating taps and keystrokes, to ensure everything settles before getting shapes

Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: