summaryrefslogtreecommitdiff
path: root/tests
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2012-11-24 14:04:28 +0100
committerAndrea Azzarone <azzaronea@gmail.com>2012-11-24 14:04:28 +0100
commit693f3d781e6054d70848037e6e5da365e94b58d1 (patch)
tree6f2e2ba56b7244c5a3c8d1a0a0cd03accfe5e982 /tests
parent2df6e818540957b6340c6b94e0c88cdc14cd5635 (diff)
Comment XTest code.
(bzr r2898.4.19)
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/test_xdnd_start_stop_notifier_imp.cpp16
2 files changed, 9 insertions, 9 deletions
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 <Nux/Nux.h>
#include <X11/Xlib.h>
-#include <X11/extensions/XTest.h>
+//#include <X11/extensions/XTest.h>
#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);