Update upstream source from tag 'upstream/2.4.0+dfsg'

Update to upstream version '2.4.0+dfsg'
with Debian dir 4b6668cc08c7b0e56b1e1f7b4e89ecdb316182a0

1 files changed, 41 insertions, 38 deletions

diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp
index d404abc..92767bf 100644
--- a/src/test/integtests/net/NetworkTests.cpp
+++ b/src/test/integtests/net/NetworkTests.cpp
@@ -1,11 +1,11 @@
 /*
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2013-2016 Symless Ltd.
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,7 +18,7 @@
 // TODO: fix, tests failing intermittently on mac.
 #ifndef WINAPI_CARBON
 
-#define TEST_ENV
+#define BARRIER_TEST_ENV
 
 #include "test/mock/server/MockConfig.h"
 #include "test/mock/server/MockPrimaryClient.h"
@@ -36,7 +36,6 @@
 #include "net/TCPSocketFactory.h"
 #include "mt/Thread.h"
 #include "base/TMethodEventJob.h"
-#include "base/TMethodJob.h"
 #include "base/Log.h"
 #include <stdexcept>
 
@@ -84,19 +83,19 @@ public:
     }
 
     void                sendMockData(void* eventTarget);
-    
+
     void                sendToClient_mockData_handleClientConnected(const Event&, void* vlistener);
     void                sendToClient_mockData_fileRecieveCompleted(const Event&, void*);
-    
+
     void                sendToClient_mockFile_handleClientConnected(const Event&, void* vlistener);
     void                sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*);
-    
+
     void                sendToServer_mockData_handleClientConnected(const Event&, void* vlistener);
     void                sendToServer_mockData_fileRecieveCompleted(const Event& event, void*);
 
     void                sendToServer_mockFile_handleClientConnected(const Event&, void* vlistener);
     void                sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*);
-    
+
 public:
     TestEventQueue        m_events;
     UInt8*                m_mockData;
@@ -111,16 +110,17 @@ TEST_F(NetworkTests, sendToClient_mockData)
     NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
 
     serverAddress.resolve();
-    
+
     // server
     SocketMultiplexer serverSocketMultiplexer;
     TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
-    ClientListener listener(serverAddress, serverSocketFactory, &m_events, false);
+    ClientListener listener(serverAddress, serverSocketFactory, &m_events,
+                            ConnectionSecurityLevel::PLAINTEXT);
     NiceMock<MockScreen> serverScreen;
     NiceMock<MockPrimaryClient> primaryClient;
     NiceMock<MockConfig> serverConfig;
     NiceMock<MockInputFilter> serverInputFilter;
-    
+
     m_events.adoptHandler(
         m_events.forClientListener().connected(), &listener,
         new TMethodEventJob<NetworkTests>(
@@ -128,7 +128,7 @@ TEST_F(NetworkTests, sendToClient_mockData)
 
     ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true));
     ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter));
-    
+
     ServerArgs serverArgs;
     serverArgs.m_enableDragDrop = true;
     Server server(serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs);
@@ -139,7 +139,7 @@ TEST_F(NetworkTests, sendToClient_mockData)
     NiceMock<MockScreen> clientScreen;
     SocketMultiplexer clientSocketMultiplexer;
     TCPSocketFactory* clientSocketFactory = new TCPSocketFactory(&m_events, &clientSocketMultiplexer);
-    
+
     ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
     ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
 
@@ -148,7 +148,7 @@ TEST_F(NetworkTests, sendToClient_mockData)
     clientArgs.m_enableDragDrop = true;
     clientArgs.m_enableCrypto = false;
     Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
-        
+
     m_events.adoptHandler(
         m_events.forFile().fileRecieveCompleted(), &client,
         new TMethodEventJob<NetworkTests>(
@@ -169,16 +169,17 @@ TEST_F(NetworkTests, sendToClient_mockFile)
     NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
 
     serverAddress.resolve();
-    
+
     // server
     SocketMultiplexer serverSocketMultiplexer;
     TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
-    ClientListener listener(serverAddress, serverSocketFactory, &m_events, false);
+    ClientListener listener(serverAddress, serverSocketFactory, &m_events,
+                            ConnectionSecurityLevel::PLAINTEXT);
     NiceMock<MockScreen> serverScreen;
     NiceMock<MockPrimaryClient> primaryClient;
     NiceMock<MockConfig> serverConfig;
     NiceMock<MockInputFilter> serverInputFilter;
-    
+
     m_events.adoptHandler(
         m_events.forClientListener().connected(), &listener,
         new TMethodEventJob<NetworkTests>(
@@ -186,7 +187,7 @@ TEST_F(NetworkTests, sendToClient_mockFile)
 
     ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true));
     ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter));
-    
+
     ServerArgs serverArgs;
     serverArgs.m_enableDragDrop = true;
     Server server(serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs);
@@ -197,7 +198,7 @@ TEST_F(NetworkTests, sendToClient_mockFile)
     NiceMock<MockScreen> clientScreen;
     SocketMultiplexer clientSocketMultiplexer;
     TCPSocketFactory* clientSocketFactory = new TCPSocketFactory(&m_events, &clientSocketMultiplexer);
-    
+
     ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
     ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
 
@@ -206,7 +207,7 @@ TEST_F(NetworkTests, sendToClient_mockFile)
     clientArgs.m_enableDragDrop = true;
     clientArgs.m_enableCrypto = false;
     Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
-        
+
     m_events.adoptHandler(
         m_events.forFile().fileRecieveCompleted(), &client,
         new TMethodEventJob<NetworkTests>(
@@ -230,7 +231,8 @@ TEST_F(NetworkTests, sendToServer_mockData)
     // server
     SocketMultiplexer serverSocketMultiplexer;
     TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
-    ClientListener listener(serverAddress, serverSocketFactory, &m_events, false);
+    ClientListener listener(serverAddress, serverSocketFactory, &m_events,
+                            ConnectionSecurityLevel::PLAINTEXT);
     NiceMock<MockScreen> serverScreen;
     NiceMock<MockPrimaryClient> primaryClient;
     NiceMock<MockConfig> serverConfig;
@@ -238,7 +240,7 @@ TEST_F(NetworkTests, sendToServer_mockData)
 
     ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true));
     ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter));
-    
+
     ServerArgs serverArgs;
     serverArgs.m_enableDragDrop = true;
     Server server(serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs);
@@ -249,7 +251,7 @@ TEST_F(NetworkTests, sendToServer_mockData)
     NiceMock<MockScreen> clientScreen;
     SocketMultiplexer clientSocketMultiplexer;
     TCPSocketFactory* clientSocketFactory = new TCPSocketFactory(&m_events, &clientSocketMultiplexer);
-    
+
     ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
     ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
 
@@ -257,7 +259,7 @@ TEST_F(NetworkTests, sendToServer_mockData)
     clientArgs.m_enableDragDrop = true;
     clientArgs.m_enableCrypto = false;
     Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
-    
+
     m_events.adoptHandler(
         m_events.forClientListener().connected(), &listener,
         new TMethodEventJob<NetworkTests>(
@@ -287,7 +289,8 @@ TEST_F(NetworkTests, sendToServer_mockFile)
     // server
     SocketMultiplexer serverSocketMultiplexer;
     TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
-    ClientListener listener(serverAddress, serverSocketFactory, &m_events, false);
+    ClientListener listener(serverAddress, serverSocketFactory, &m_events,
+                            ConnectionSecurityLevel::PLAINTEXT);
     NiceMock<MockScreen> serverScreen;
     NiceMock<MockPrimaryClient> primaryClient;
     NiceMock<MockConfig> serverConfig;
@@ -295,7 +298,7 @@ TEST_F(NetworkTests, sendToServer_mockFile)
 
     ON_CALL(serverConfig, isScreen(_)).WillByDefault(Return(true));
     ON_CALL(serverConfig, getInputFilter()).WillByDefault(Return(&serverInputFilter));
-    
+
     ServerArgs serverArgs;
     serverArgs.m_enableDragDrop = true;
     Server server(serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs);
@@ -306,7 +309,7 @@ TEST_F(NetworkTests, sendToServer_mockFile)
     NiceMock<MockScreen> clientScreen;
     SocketMultiplexer clientSocketMultiplexer;
     TCPSocketFactory* clientSocketFactory = new TCPSocketFactory(&m_events, &clientSocketMultiplexer);
-    
+
     ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
     ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
 
@@ -334,7 +337,7 @@ TEST_F(NetworkTests, sendToServer_mockFile)
     m_events.cleanupQuitTimeout();
 }
 
-void 
+void
 NetworkTests::sendToClient_mockData_handleClientConnected(const Event&, void* vlistener)
 {
     ClientListener* listener = static_cast<ClientListener*>(vlistener);
@@ -352,7 +355,7 @@ NetworkTests::sendToClient_mockData_handleClientConnected(const Event&, void* vl
     sendMockData(server);
 }
 
-void 
+void
 NetworkTests::sendToClient_mockData_fileRecieveCompleted(const Event& event, void*)
 {
     Client* client = static_cast<Client*>(event.getTarget());
@@ -361,7 +364,7 @@ NetworkTests::sendToClient_mockData_fileRecieveCompleted(const Event& event, voi
     m_events.raiseQuitEvent();
 }
 
-void 
+void
 NetworkTests::sendToClient_mockFile_handleClientConnected(const Event&, void* vlistener)
 {
     ClientListener* listener = static_cast<ClientListener*>(vlistener);
@@ -379,7 +382,7 @@ NetworkTests::sendToClient_mockFile_handleClientConnected(const Event&, void* vl
     server->sendFileToClient(kMockFilename);
 }
 
-void 
+void
 NetworkTests::sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*)
 {
     Client* client = static_cast<Client*>(event.getTarget());
@@ -388,14 +391,14 @@ NetworkTests::sendToClient_mockFile_fileRecieveCompleted(const Event& event, voi
     m_events.raiseQuitEvent();
 }
 
-void 
+void
 NetworkTests::sendToServer_mockData_handleClientConnected(const Event&, void* vclient)
 {
     Client* client = static_cast<Client*>(vclient);
     sendMockData(client);
 }
 
-void 
+void
 NetworkTests::sendToServer_mockData_fileRecieveCompleted(const Event& event, void*)
 {
     Server* server = static_cast<Server*>(event.getTarget());
@@ -404,14 +407,14 @@ NetworkTests::sendToServer_mockData_fileRecieveCompleted(const Event& event, voi
     m_events.raiseQuitEvent();
 }
 
-void 
+void
 NetworkTests::sendToServer_mockFile_handleClientConnected(const Event&, void* vclient)
 {
     Client* client = static_cast<Client*>(vclient);
     client->sendFileToServer(kMockFilename);
 }
 
-void 
+void
 NetworkTests::sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*)
 {
     Server* server = static_cast<Server*>(event.getTarget());
@@ -420,13 +423,13 @@ NetworkTests::sendToServer_mockFile_fileRecieveCompleted(const Event& event, voi
     m_events.raiseQuitEvent();
 }
 
-void 
+void
 NetworkTests::sendMockData(void* eventTarget)
 {
     // send first message (file size)
     String size = barrier::string::sizeTypeToString(kMockDataSize);
     FileChunk* sizeMessage = FileChunk::start(size);
-    
+
     m_events.addEvent(Event(m_events.forFile().fileChunkSending(), eventTarget, sizeMessage));
 
     // send chunk messages with incrementing chunk size
@@ -452,7 +455,7 @@ NetworkTests::sendMockData(void* eventTarget)
         }
 
     }
-    
+
     // send last message
     FileChunk* transferFinished = FileChunk::end();
     m_events.addEvent(Event(m_events.forFile().fileChunkSending(), eventTarget, transferFinished));