Merge lp:~3v1n0/unity/xdnd-tests-enable into lp:unity

[Marco Trevisan (Treviño)]

TestXdndStartStopNotifierImp: enable some unstable tests by adding XTest support

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-09-01 23:13:26 +0000
+++ debian/control	2016-09-06 20:27:50 +0000
@@ -47,6 +47,7 @@
                libxfixes-dev (>= 1:5.0.1),
                libxi-dev (>= 2:1.7.1.901),
                libxpathselect-dev (>=1.4),
+               libxtst-dev,
                libzeitgeist-2.0-dev,
                pkg-config,
                python (>= 2.7),
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-12-17 22:32:37 +0000
+++ tests/CMakeLists.txt	2016-09-06 20:27:50 +0000
@@ -8,7 +8,7 @@
 #
 # Unit tests
 #
-set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;")
+set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;xtst")
 pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS})
 
 string (REPLACE ";" " " TEST_UNIT_DEPS_CFLAGS_OTHER "${TEST_UNIT_CFLAGS_OTHER}")
 
=== modified file 'tests/test_xdnd_start_stop_notifier_imp.cpp'
--- tests/test_xdnd_start_stop_notifier_imp.cpp	2015-09-30 20:59:26 +0000
+++ tests/test_xdnd_start_stop_notifier_imp.cpp	2016-09-06 20:27:50 +0000
@@ -24,7 +24,7 @@
 
 #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 @@
   unity::XdndStartStopNotifierImp xdnd_start_stop_notifier;
 };
 
-TEST_F(TestXdndStartStopNotifierImp, UNSTABLE_TEST(SignalStarted))
+TEST_F(TestXdndStartStopNotifierImp, SignalStarted)
 {
   bool signal_received = false;
   xdnd_start_stop_notifier.started.connect([&](){
@@ -55,15 +55,15 @@
   });
 
   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::WaitUntil(signal_received);
-  //XTestFakeButtonEvent(display_, 1, False, CurrentTime);
+  XTestFakeButtonEvent(display_, 1, False, CurrentTime);
 }
 
-TEST_F(TestXdndStartStopNotifierImp, UNSTABLE_TEST(SignalFinished))
+TEST_F(TestXdndStartStopNotifierImp, SignalFinished)
 {
   bool signal_received = false;
   xdnd_start_stop_notifier.finished.connect([&](){
@@ -71,34 +71,34 @@
   });
 
   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_SignalFinished_QT)
+TEST_F(TestXdndStartStopNotifierImp, SignalFinished_QT)
 {
   bool signal_received = false;
-  xdnd_start_stop_notifier.finished.connect([&](){
+  xdnd_start_stop_notifier.finished.connect([&signal_received] {
     signal_received = true;
   });
 
   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);