From 693f3d781e6054d70848037e6e5da365e94b58d1 Mon Sep 17 00:00:00 2001 From: Andrea Azzarone Date: Sat, 24 Nov 2012 14:04:28 +0100 Subject: Comment XTest code. (bzr r2898.4.19) --- tests/CMakeLists.txt | 2 +- tests/test_xdnd_start_stop_notifier_imp.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cc283bf3a..35cfd7883 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -34,7 +34,7 @@ set (CFLAGS ) add_definitions (${CFLAGS}) -set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lcompiz_core -lm -lXtst") +set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lcompiz_core -lm") link_libraries (${LIBS}) set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS}) diff --git a/tests/test_xdnd_start_stop_notifier_imp.cpp b/tests/test_xdnd_start_stop_notifier_imp.cpp index 3effb263b..d21a42eba 100644 --- a/tests/test_xdnd_start_stop_notifier_imp.cpp +++ b/tests/test_xdnd_start_stop_notifier_imp.cpp @@ -24,7 +24,7 @@ using namespace testing; #include #include -#include +//#include #include "unity-shared/WindowManager.h" #include "test_utils.h" @@ -47,7 +47,7 @@ struct TestXdndStartStopNotifierImp : public Test { unity::XdndStartStopNotifierImp xdnd_start_stop_notifier; }; -TEST_F(TestXdndStartStopNotifierImp, SignalStarted) +TEST_F(TestXdndStartStopNotifierImp, DISABLED_SignalStarted) { bool signal_received = false; xdnd_start_stop_notifier.started.connect([&](){ @@ -55,7 +55,7 @@ TEST_F(TestXdndStartStopNotifierImp, SignalStarted) }); XSetSelectionOwner(display_, selection_, owner_, CurrentTime); - XTestFakeButtonEvent(display_, 1, True, CurrentTime); + //XTestFakeButtonEvent(display_, 1, True, CurrentTime); auto& wm = unity::WindowManager::Default(); wm.window_mapped.emit(0); @@ -71,20 +71,20 @@ TEST_F(TestXdndStartStopNotifierImp, DISABLED_SignalFinished) }); XSetSelectionOwner(display_, selection_, owner_, CurrentTime); - XTestFakeButtonEvent(display_, 1, True, CurrentTime); + //XTestFakeButtonEvent(display_, 1, True, CurrentTime); auto& wm = unity::WindowManager::Default(); wm.window_mapped.emit(0); Utils::WaitForTimeoutMSec(500); XSetSelectionOwner(display_, selection_, None, CurrentTime); - XTestFakeButtonEvent(display_, 1, False, CurrentTime); + //XTestFakeButtonEvent(display_, 1, False, CurrentTime); wm.window_unmapped.emit(0); Utils::WaitUntil(signal_received); } -TEST_F(TestXdndStartStopNotifierImp, DISABLED_SSignalFinished_QT) +TEST_F(TestXdndStartStopNotifierImp, DISABLED_SignalFinished_QT) { bool signal_received = false; xdnd_start_stop_notifier.finished.connect([&](){ @@ -92,13 +92,13 @@ TEST_F(TestXdndStartStopNotifierImp, DISABLED_SSignalFinished_QT) }); XSetSelectionOwner(display_, selection_, owner_, CurrentTime); - XTestFakeButtonEvent(display_, 1, True, CurrentTime); + //XTestFakeButtonEvent(display_, 1, True, CurrentTime); auto& wm = unity::WindowManager::Default(); wm.window_mapped.emit(0); Utils::WaitForTimeoutMSec(500); - XTestFakeButtonEvent(display_, 1, False, CurrentTime); + //XTestFakeButtonEvent(display_, 1, False, CurrentTime); wm.window_unmapped.emit(0); Utils::WaitUntil(signal_received); -- cgit v1.2.3