Unity

Merge lp://qastaging/~dandrader/unity/lp969554 into lp://qastaging/unity

  1. lp969554
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2241
Proposed branch: lp://qastaging/~dandrader/unity/lp969554
Merge into: lp://qastaging/unity
Prerequisite: lp://qastaging/~dandrader/unity/lp940612
Diff against target: 157 lines (+72/-9)
4 files modified
plugins/unityshell/src/GestureEngine.cpp (+2/-6)
plugins/unityshell/src/GestureEngine.h (+0/-1)
tests/test-gesture-engine/compiz_mock/core/window.h (+5/-2)
tests/test-gesture-engine/test_gesture_engine.cpp (+65/-0)
To merge this branch: bzr merge lp://qastaging/~dandrader/unity/lp969554
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+100833@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-03-30.

Commit message

Fix pinch gesture.

Description of the change

Fixes bug #969554

Now with unit tests.

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote : Posted in a previous version of this proposal

Hi,

How can we test this? We need either a unit test, or an autopilot test, or, as a final resort, a manual test. From the looks of it, GestureEngine is going to be tricky to write a unit test for (it contains a lot of XLib calls, and is tightly coupled with CompScreen), but perhaps we can write an autopilot test? We'd need to work out how to simulate multi-touch using python & XLib.

...If that doesn't work, we need a manual test. Please consult the README and TEST_TEMPLATE files in manual-tests/ before writing one.

Thanks

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

> How can we test this? We need either a unit test, or an autopilot test, or, as
> a final resort, a manual test.[...]

It now has a unit test, but it's built on top of the commits from lp:~dandrader/unity/lp940612 (merge proposal https://code.launchpad.net/~dandrader/unity/lp940612/+merge/99956)

Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

Looks good to me.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~dandrader/unity/lp940612 has not yet been merged into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote :

No proposals found for merge of lp:~dandrader/unity/lp940612 into lp:unity.

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.