From 2d0d0010d74c036bd063a28eba8e1d527b9a4e8b Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Fri, 7 Feb 2014 12:33:26 +0000 Subject: [PATCH] fixed: integ tests - drag drop was disabled. --- src/test/integtests/NetworkTests.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/integtests/NetworkTests.cpp b/src/test/integtests/NetworkTests.cpp index fe953600..b06ce135 100644 --- a/src/test/integtests/NetworkTests.cpp +++ b/src/test/integtests/NetworkTests.cpp @@ -130,7 +130,7 @@ TEST_F(NetworkTests, sendToClient_mockData) ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true)); ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter)); - CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, false); + CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, true); server.m_mock = true; listener.setServer(&server); @@ -142,7 +142,7 @@ TEST_F(NetworkTests, sendToClient_mockData) ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, false); + CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, true); m_events.adoptHandler( m_events.forIScreen().fileRecieveCompleted(), &client, @@ -183,7 +183,7 @@ TEST_F(NetworkTests, sendToClient_mockFile) ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true)); ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter)); - CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, false); + CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, true); server.m_mock = true; listener.setServer(&server); @@ -195,7 +195,7 @@ TEST_F(NetworkTests, sendToClient_mockFile) ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, false); + CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, true); m_events.adoptHandler( m_events.forIScreen().fileRecieveCompleted(), &client, @@ -231,7 +231,7 @@ TEST_F(NetworkTests, sendToServer_mockData) ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true)); ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter)); - CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, false); + CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, true); server.m_mock = true; listener.setServer(&server); @@ -243,7 +243,7 @@ TEST_F(NetworkTests, sendToServer_mockData) ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, false); + CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, true); m_events.adoptHandler( m_events.forCClientListener().connected(), &listener, @@ -284,7 +284,7 @@ TEST_F(NetworkTests, sendToServer_mockFile) ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true)); ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter)); - CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, false); + CServer server(serverConfig, &primaryClient, &serverScreen, &m_events, true); server.m_mock = true; listener.setServer(&server); @@ -296,7 +296,7 @@ TEST_F(NetworkTests, sendToServer_mockFile) ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, false); + CClient client(&m_events, "stub", serverAddress, clientSocketFactory, NULL, &clientScreen, cryptoOptions, true); m_events.adoptHandler( m_events.forCClientListener().connected(), &listener,