Skip to content

Commit 987ce52

Browse files
JoostJMJoostJM
committed
BUG: Fix errors in connection tests
Due to new interface with proxy connections, ensure the correct Mock objects are used and setup.
1 parent fb59466 commit 987ce52

File tree

31 files changed

+62
-62
lines changed

31 files changed

+62
-62
lines changed

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ protected override void SetupData()
3838
_actualException = null;
3939

4040
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
41-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
41+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
4242
}
4343

4444
protected override void SetupMocks()
4545
{
4646
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
4747
.Returns(_clientSocket);
48-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
48+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
4949
.Returns(_proxyConnector);
5050
}
5151

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void SetupData()
3838
_actualException = null;
3939

4040
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
41-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
41+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
4242

4343
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
4444
_proxyServer.Disconnected += socket => _disconnected = true;
@@ -53,7 +53,7 @@ protected override void SetupMocks()
5353
{
5454
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
5555
.Returns(_clientSocket);
56-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
56+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
5757
.Returns(_proxyConnector);
5858
}
5959

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ protected override void SetupData()
2626
"proxyPwd",
2727
new KeyboardInteractiveAuthenticationMethod("user"));
2828
_proxyConnectionInfo = (ProxyConnectionInfo)_connectionInfo.ProxyConnection;
29-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
29+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
3030
_actualException = null;
3131
}
3232

3333
protected override void SetupMocks()
3434
{
35-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
35+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
3636
.Returns(_proxyConnector);
3737
}
3838

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void SetupData()
4747
_bytesReceivedByProxy = new List<byte>();
4848
_disconnected = false;
4949
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
50-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
50+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
5151

5252
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
5353
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -72,7 +72,7 @@ protected override void SetupMocks()
7272
{
7373
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
7474
.Returns(_clientSocket);
75-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
75+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
7676
.Returns(_proxyConnector);
7777
}
7878

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void SetupData()
4747
_bytesReceivedByProxy = new List<byte>();
4848
_disconnected = false;
4949
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
50-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
50+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
5151

5252
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
5353
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -72,7 +72,7 @@ protected override void SetupMocks()
7272
{
7373
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
7474
.Returns(_clientSocket);
75-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
75+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
7676
.Returns(_proxyConnector);
7777
}
7878

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected override void SetupData()
4242
_actualException = null;
4343

4444
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
45-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
45+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
4646

4747
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
4848
_proxyServer.Disconnected += socket => _disconnected = true;
@@ -63,7 +63,7 @@ protected override void SetupMocks()
6363
{
6464
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
6565
.Returns(_clientSocket);
66-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
66+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
6767
.Returns(_proxyConnector);
6868
}
6969

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void SetupData()
4747
_bytesReceivedByProxy = new List<byte>();
4848
_disconnected = false;
4949
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
50-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
50+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
5151

5252
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
5353
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -76,7 +76,7 @@ protected override void SetupMocks()
7676
{
7777
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
7878
.Returns(_clientSocket);
79-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
79+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
8080
.Returns(_proxyConnector);
8181
}
8282

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void SetupData()
4747
_bytesReceivedByProxy = new List<byte>();
4848
_disconnected = false;
4949
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
50-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
50+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
5151

5252
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
5353
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -76,7 +76,7 @@ protected override void SetupMocks()
7676
{
7777
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
7878
.Returns(_clientSocket);
79-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
79+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
8080
.Returns(_proxyConnector);
8181
}
8282

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void SetupData()
4747
_bytesReceivedByProxy = new List<byte>();
4848
_disconnected = false;
4949
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
50-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
50+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
5151

5252
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
5353
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -74,7 +74,7 @@ protected override void SetupMocks()
7474
{
7575
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
7676
.Returns(_clientSocket);
77-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
77+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
7878
.Returns(_proxyConnector);
7979
}
8080

‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected override void SetupData()
4242
_actualException = null;
4343

4444
_clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
45-
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
45+
_proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object);
4646

4747
_proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
4848
_proxyServer.Disconnected += (socket) => _disconnected = true;
@@ -63,7 +63,7 @@ protected override void SetupMocks()
6363
{
6464
SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
6565
.Returns(_clientSocket);
66-
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
66+
ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactoryMock.Object))
6767
.Returns(_proxyConnector);
6868
}
6969

0 commit comments

Comments
 (0)