2 files changed, 14 insertions, 25 deletions
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp
index 0583f785c..516125484 100644
--- a/tests/test_launcher_controller.cpp
+++ b/tests/test_launcher_controller.cpp
@@ -221,7 +221,7 @@ struct TestLauncherController : public testing::Test
 protected:
 struct MockLauncherController : Controller
 {
- MockLauncherController(XdndManager::Ptr xdnd_manager)
+ MockLauncherController(XdndManager::Ptr const& xdnd_manager)
 : Controller(xdnd_manager)
 {}
 
diff --git a/tests/test_xdnd_manager_imp.cpp b/tests/test_xdnd_manager_imp.cpp
index 66472b489..1e4f3a8ab 100644
--- a/tests/test_xdnd_manager_imp.cpp
+++ b/tests/test_xdnd_manager_imp.cpp
@@ -52,7 +52,7 @@ public:
 , xdnd_manager(xdnd_start_stop_notifier_, xdnd_collection_window_)
 {}
 
- void SetUp() /*override*/
+ void SetUp()
 {
 // Evil hack to avoid crashes.
 XEvent xevent;
@@ -69,7 +69,7 @@ public:
 unity::XdndManagerImp xdnd_manager;
 };
 
-TEST_F(TestXdndManager, SignalDndStarted)
+TEST_F(TestXdndManager, SignalDndStartedAndFinished)
 {
 std::vector<std::string> mimes;
 mimes.push_back("text/uri-list");
@@ -83,20 +83,24 @@ TEST_F(TestXdndManager, SignalDndStarted)
 .Times(1)
 .WillOnce(Invoke(emit_collected_signal));
 
- //EXPECT_CALL(uscreen, GetMonitorWithMouse())
- //.WillRepetdly(Return(1));
-
 bool dnd_started_emitted = false;
- //int monitor_collected = 0;
 xdnd_manager.dnd_started.connect([&] (std::string const& /*data*/, int /*monitor*/) {
 	dnd_started_emitted = true;
- //monitor_collected = monitor;
 });
 
 xdnd_start_stop_notifier_->started.emit();
-
 Utils::WaitUntil(dnd_started_emitted);
- //EXPECT_EQ(monitor_collected, 1);
+
+ EXPECT_CALL(*xdnd_collection_window_, Deactivate())
+ .Times(1);
+
+ bool dnd_finished_emitted = false;
+ xdnd_manager.dnd_finished.connect([&] () {
+ dnd_finished_emitted = true;
+ });
+
+ xdnd_start_stop_notifier_->finished.emit();
+ Utils::WaitUntil(dnd_finished_emitted);
 }
 
 TEST_F(TestXdndManager, SignalDndStarted_InvalidMimes)
@@ -123,19 +127,4 @@ TEST_F(TestXdndManager, SignalDndStarted_InvalidMimes)
 EXPECT_FALSE(dnd_started_emitted);
 }
 
-TEST_F(TestXdndManager, SignalDndFinished)
-{
- EXPECT_CALL(*xdnd_collection_window_, Deactivate())
- .Times(1);
-
- bool dnd_finished_emitted = false;
- xdnd_manager.dnd_finished.connect([&] () {
-	dnd_finished_emitted = true;
- });
-
- xdnd_start_stop_notifier_->finished.emit();
-
- Utils::WaitUntil(dnd_finished_emitted);
-}
-
 }