diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/MockWindowManager.h | 1 | ||||
| -rw-r--r-- | tests/test-gestures/WindowGestureTargetMock.h | 1 | ||||
| -rw-r--r-- | tests/test-gestures/compiz_mock/core/screen.h | 1 | ||||
| -rw-r--r-- | tests/test-gestures/test_gestures_main.cpp | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/tests/MockWindowManager.h b/tests/MockWindowManager.h index f1093d61d..19df0db4c 100644 --- a/tests/MockWindowManager.h +++ b/tests/MockWindowManager.h @@ -101,6 +101,7 @@ class MockWindowManager : public WindowManager MOCK_CONST_METHOD1(GetWindowName, std::string(Window)); MOCK_CONST_METHOD1(IsOnscreenKeyboard, bool(Window)); + MOCK_CONST_METHOD1(GetCachedCursor, Cursor(unsigned int)); MOCK_METHOD1(AddProperties, void(GVariantBuilder*)); }; diff --git a/tests/test-gestures/WindowGestureTargetMock.h b/tests/test-gestures/WindowGestureTargetMock.h index e43bad80c..6d0a1a9f4 100644 --- a/tests/test-gestures/WindowGestureTargetMock.h +++ b/tests/test-gestures/WindowGestureTargetMock.h @@ -32,7 +32,6 @@ class WindowGestureTargetMock : public nux::GestureTarget CompWindowMock *window; std::list<nux::GestureEvent> events_received; - static Cursor fleur_cursor; private: virtual bool Equals(const nux::GestureTarget& other) const { diff --git a/tests/test-gestures/compiz_mock/core/screen.h b/tests/test-gestures/compiz_mock/core/screen.h index 225d41c65..f8dd81058 100644 --- a/tests/test-gestures/compiz_mock/core/screen.h +++ b/tests/test-gestures/compiz_mock/core/screen.h @@ -58,6 +58,7 @@ public: } Cursor invisibleCursor() {return 1;} + Cursor cursorCache(unsigned int) {return 0;} int width_; int height_; diff --git a/tests/test-gestures/test_gestures_main.cpp b/tests/test-gestures/test_gestures_main.cpp index 1d99b8a25..8c863fa40 100644 --- a/tests/test-gestures/test_gestures_main.cpp +++ b/tests/test-gestures/test_gestures_main.cpp @@ -46,7 +46,6 @@ void nux::GestureEvent::Reject() g_gesture_event_reject_count[gesture_id_] + 1; } -Cursor WindowGestureTargetMock::fleur_cursor = 0; std::set<WindowGestureTargetMock*> g_window_target_mocks; int main(int argc, char** argv) |
