3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-26 21:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

deleted old home brew crypto #4313

Browse source
This commit is contained in:
XinyuHou 2015-02-11 11:12:54 +00:00
parent 4fcec1d217
commit 80343c41eb
53 changed files with 352 additions and 1902 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/test/integtests/net/NetworkTests.cpp
View file

@ -32,7 +32,6 @@
#include "net/SocketMultiplexer.h"
#include "net/NetworkAddress.h"
#include "net/TCPSocketFactory.h"
#include "io/CryptoOptions.h"
#include "mt/Thread.h"
#include "base/TMethodEventJob.h"
#include "base/TMethodJob.h"
@ -109,14 +108,13 @@ TEST_F(NetworkTests, sendToClient_mockData)
{
// server and client
NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
CryptoOptions cryptoOptions;
serverAddress.resolve();
// server
SocketMultiplexer serverSocketMultiplexer;
TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
ClientListener listener(serverAddress, serverSocketFactory, cryptoOptions, &m_events);
ClientListener listener(serverAddress, serverSocketFactory, &m_events);
NiceMock<MockScreen> serverScreen;
NiceMock<MockPrimaryClient> primaryClient;
NiceMock<MockConfig> serverConfig;
@ -142,7 +140,7 @@ TEST_F(NetworkTests, sendToClient_mockData)
ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, cryptoOptions, true);
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, true);
m_events.adoptHandler(
m_events.forIScreen().fileRecieveCompleted(), &client,
@ -162,14 +160,13 @@ TEST_F(NetworkTests, sendToClient_mockFile)
{
// server and client
NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
CryptoOptions cryptoOptions;
serverAddress.resolve();
// server
SocketMultiplexer serverSocketMultiplexer;
TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
ClientListener listener(serverAddress, serverSocketFactory, cryptoOptions, &m_events);
ClientListener listener(serverAddress, serverSocketFactory, &m_events);
NiceMock<MockScreen> serverScreen;
NiceMock<MockPrimaryClient> primaryClient;
NiceMock<MockConfig> serverConfig;
@ -195,7 +192,7 @@ TEST_F(NetworkTests, sendToClient_mockFile)
ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, cryptoOptions, true);
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, true);
m_events.adoptHandler(
m_events.forIScreen().fileRecieveCompleted(), &client,
@ -215,14 +212,12 @@ TEST_F(NetworkTests, sendToServer_mockData)
{
// server and client
NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
CryptoOptions cryptoOptions;
serverAddress.resolve();
// server
SocketMultiplexer serverSocketMultiplexer;
TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
ClientListener listener(serverAddress, serverSocketFactory, cryptoOptions, &m_events);
ClientListener listener(serverAddress, serverSocketFactory, &m_events);
NiceMock<MockScreen> serverScreen;
NiceMock<MockPrimaryClient> primaryClient;
NiceMock<MockConfig> serverConfig;
@ -243,7 +238,7 @@ TEST_F(NetworkTests, sendToServer_mockData)
ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, cryptoOptions, true);
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, true);
m_events.adoptHandler(
m_events.forClientListener().connected(), &listener,
@ -268,14 +263,13 @@ TEST_F(NetworkTests, sendToServer_mockFile)
{
// server and client
NetworkAddress serverAddress(TEST_HOST, TEST_PORT);
CryptoOptions cryptoOptions;
serverAddress.resolve();
// server
SocketMultiplexer serverSocketMultiplexer;
TCPSocketFactory* serverSocketFactory = new TCPSocketFactory(&m_events, &serverSocketMultiplexer);
ClientListener listener(serverAddress, serverSocketFactory, cryptoOptions, &m_events);
ClientListener listener(serverAddress, serverSocketFactory, &m_events);
NiceMock<MockScreen> serverScreen;
NiceMock<MockPrimaryClient> primaryClient;
NiceMock<MockConfig> serverConfig;
@ -296,7 +290,7 @@ TEST_F(NetworkTests, sendToServer_mockFile)
ON_CALL(clientScreen, getShape(_, _, _, _)).WillByDefault(Invoke(getScreenShape));
ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos));
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, cryptoOptions, true);
Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, true);
m_events.adoptHandler(
m_events.forClientListener().connected(), &listener,