Unity

Merge lp:~townsend/unity/fix-broken-test-6.0 into lp:unity/6.0

  1. fix-broken-test-6.0
  2. Merge into 6.0
Proposed by Christopher Townsend
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: no longer in the source branch.
Merged at revision: 2803
Proposed branch: lp:~townsend/unity/fix-broken-test-6.0
Merge into: lp:unity/6.0
Diff against target: 11 lines (+1/-0)
1 file modified
tests/test_panel_menu_view.cpp (+1/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-broken-test-6.0
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+157202@code.launchpad.net

Commit message

Fix a compilation issue in a test due to the merge of revno. 2802.

Description of the change

The merge in revno. 2802 was not complete.

This fixes a compilation error in test-gtest due to me missing the need to define a pure virtual function in MockWindowManager. I did not have google-mock installed and nothing indicated it should be, so I missed this error.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

LGTM, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_panel_menu_view.cpp'
2--- tests/test_panel_menu_view.cpp 2012-10-24 08:13:14 +0000
3+++ tests/test_panel_menu_view.cpp 2013-04-04 18:43:24 +0000
4@@ -51,6 +51,7 @@
5 bool InShowDesktop() const { return false; }
6 bool IsWindowMaximized(guint32 xid) const { return false; }
7 bool IsWindowDecorated(guint32 xid) { return true; }
8+ bool HasWindowDecorations(guint32 xid) const { return true; }
9 bool IsWindowOnCurrentDesktop(guint32 xid) const { return true; }
10 bool IsWindowObscured(guint32 xid) const { return false; }
11 bool IsWindowMapped(guint32 xid) const { return true; }

Subscribers

People subscribed via source and target branches