From 919af754dfb0d9a32544f569fcf34eca2f59fb26 Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Tue, 18 Jun 2024 06:41:00 +0100 Subject: [PATCH] Remove unnecessary DNS lookup in Connect (#1412) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The library currently performs a DNS lookup of the desired host, takes the first returned IP address and connects to that. Instead, we can just pass the hostname down to System.Net.Sockets which will do the right thing, potentially trying multiple addresses if needed. Co-authored-by: Wojciech Nagórski --- .../Abstractions/SocketAbstraction.cs | 6 +-- .../Abstractions/SocketExtensions.cs | 2 +- src/Renci.SshNet/Connection/ConnectorBase.cs | 37 ++++++------------- .../Connection/DirectConnector.cs | 7 ++-- src/Renci.SshNet/Connection/ISocketFactory.cs | 8 ++-- src/Renci.SshNet/Connection/ProxyConnector.cs | 5 ++- src/Renci.SshNet/Connection/SocketFactory.cs | 16 ++------ ...rTest_Connect_ConnectionRefusedByServer.cs | 6 +-- ...nnectorTest_Connect_ConnectionSucceeded.cs | 6 +-- ...ctConnectorTest_Connect_HostNameInvalid.cs | 8 ++++ ...rTest_Connect_TimeoutConnectingToServer.cs | 6 +-- ...orTest_Connect_ConnectionToProxyRefused.cs | 6 +-- ...yClosesConnectionBeforeStatusLineIsSent.cs | 6 +-- ...pConnectorTest_Connect_ProxyHostInvalid.cs | 8 ++++ ...nectorTest_Connect_ProxyPasswordIsEmpty.cs | 6 +-- ...nnectorTest_Connect_ProxyPasswordIsNull.cs | 6 +-- ...oxyResponseDoesNotContainHttpStatusLine.cs | 6 +-- ...seStatusIs200_ExtraTextBeforeStatusLine.cs | 6 +-- ...xyResponseStatusIs200_HeadersAndContent.cs | 6 +-- ...ct_ProxyResponseStatusIs200_OnlyHeaders.cs | 6 +-- ...est_Connect_ProxyResponseStatusIsNot200.cs | 6 +-- ...nectorTest_Connect_ProxyUserNameIsEmpty.cs | 6 +-- ...nnect_ProxyUserNameIsNotNullAndNotEmpty.cs | 6 +-- ...nnectorTest_Connect_ProxyUserNameIsNull.cs | 6 +-- ...orTest_Connect_TimeoutConnectingToProxy.cs | 6 +-- ...rTest_Connect_TimeoutReadingHttpContent.cs | 6 +-- ...orTest_Connect_TimeoutReadingStatusLine.cs | 6 +-- ...rTest_Connect_ConnectionRejectedByProxy.cs | 6 +-- ...nnectorTest_Connect_ConnectionSucceeded.cs | 6 +-- ...orTest_Connect_ConnectionToProxyRefused.cs | 6 +-- ...orTest_Connect_TimeoutConnectingToProxy.cs | 6 +-- ...onnect_TimeoutReadingDestinationAddress.cs | 6 +-- ...torTest_Connect_TimeoutReadingReplyCode.cs | 6 +-- ...Test_Connect_TimeoutReadingReplyVersion.cs | 6 +-- ...orTest_Connect_ConnectionToProxyRefused.cs | 6 +-- ...ct_NoAuthentication_ConnectionSucceeded.cs | 6 +-- ...Connect_ProxySocksVersionIsNotSupported.cs | 6 +-- ...orTest_Connect_TimeoutConnectingToProxy.cs | 6 +-- ...ctorTest_Connect_TimeoutConnectionReply.cs | 6 +-- ...wordAuthentication_AuthenticationFailed.cs | 6 +-- ...swordAuthentication_ConnectionSucceeded.cs | 6 +-- ...entication_PasswordExceedsMaximumLength.cs | 6 +-- ...entication_UserNameExceedsMaximumLength.cs | 6 +-- 43 files changed, 147 insertions(+), 154 deletions(-) diff --git a/src/Renci.SshNet/Abstractions/SocketAbstraction.cs b/src/Renci.SshNet/Abstractions/SocketAbstraction.cs index 0997a32f..da1018cd 100644 --- a/src/Renci.SshNet/Abstractions/SocketAbstraction.cs +++ b/src/Renci.SshNet/Abstractions/SocketAbstraction.cs @@ -47,17 +47,17 @@ namespace Renci.SshNet.Abstractions return socket; } - public static void Connect(Socket socket, IPEndPoint remoteEndpoint, TimeSpan connectTimeout) + public static void Connect(Socket socket, EndPoint remoteEndpoint, TimeSpan connectTimeout) { ConnectCore(socket, remoteEndpoint, connectTimeout, ownsSocket: false); } - public static async Task ConnectAsync(Socket socket, IPEndPoint remoteEndpoint, CancellationToken cancellationToken) + public static async Task ConnectAsync(Socket socket, EndPoint remoteEndpoint, CancellationToken cancellationToken) { await socket.ConnectAsync(remoteEndpoint, cancellationToken).ConfigureAwait(false); } - private static void ConnectCore(Socket socket, IPEndPoint remoteEndpoint, TimeSpan connectTimeout, bool ownsSocket) + private static void ConnectCore(Socket socket, EndPoint remoteEndpoint, TimeSpan connectTimeout, bool ownsSocket) { var connectCompleted = new ManualResetEvent(initialState: false); var args = new SocketAsyncEventArgs diff --git a/src/Renci.SshNet/Abstractions/SocketExtensions.cs b/src/Renci.SshNet/Abstractions/SocketExtensions.cs index 03c9b050..cf8d05f4 100644 --- a/src/Renci.SshNet/Abstractions/SocketExtensions.cs +++ b/src/Renci.SshNet/Abstractions/SocketExtensions.cs @@ -85,7 +85,7 @@ namespace Renci.SshNet.Abstractions } } - public static async Task ConnectAsync(this Socket socket, IPEndPoint remoteEndpoint, CancellationToken cancellationToken) + public static async Task ConnectAsync(this Socket socket, EndPoint remoteEndpoint, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/Renci.SshNet/Connection/ConnectorBase.cs b/src/Renci.SshNet/Connection/ConnectorBase.cs index c1b30fb8..735e88c5 100644 --- a/src/Renci.SshNet/Connection/ConnectorBase.cs +++ b/src/Renci.SshNet/Connection/ConnectorBase.cs @@ -29,25 +29,21 @@ namespace Renci.SshNet.Connection public abstract Task ConnectAsync(IConnectionInfo connectionInfo, CancellationToken cancellationToken); /// - /// Establishes a socket connection to the specified host and port. + /// Establishes a socket connection to the specified endpoint. /// - /// The host name of the server to connect to. - /// The port to connect to. + /// The representing the server to connect to. /// The maximum time to wait for the connection to be established. /// The connection failed to establish within the configured . /// An error occurred trying to establish the connection. - protected Socket SocketConnect(string host, int port, TimeSpan timeout) + protected Socket SocketConnect(EndPoint endPoint, TimeSpan timeout) { - var ipAddress = Dns.GetHostAddresses(host)[0]; - var ep = new IPEndPoint(ipAddress, port); + DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}'.", endPoint)); - DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port)); - - var socket = SocketFactory.Create(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp); + var socket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); try { - SocketAbstraction.Connect(socket, ep, timeout); + SocketAbstraction.Connect(socket, endPoint, timeout); const int socketBufferSize = 10 * Session.MaximumSshPacketSize; socket.SendBufferSize = socketBufferSize; @@ -62,31 +58,22 @@ namespace Renci.SshNet.Connection } /// - /// Establishes a socket connection to the specified host and port. + /// Establishes a socket connection to the specified endpoint. /// - /// The host name of the server to connect to. - /// The port to connect to. + /// The representing the server to connect to. /// The cancellation token to observe. /// The connection failed to establish within the configured . /// An error occurred trying to establish the connection. - protected async Task SocketConnectAsync(string host, int port, CancellationToken cancellationToken) + protected async Task SocketConnectAsync(EndPoint endPoint, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); -#if NET6_0_OR_GREATER - var ipAddress = (await Dns.GetHostAddressesAsync(host, cancellationToken).ConfigureAwait(false))[0]; -#else - var ipAddress = (await Dns.GetHostAddressesAsync(host).ConfigureAwait(false))[0]; -#endif + DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}'.", endPoint)); - var ep = new IPEndPoint(ipAddress, port); - - DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port)); - - var socket = SocketFactory.Create(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp); + var socket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); try { - await SocketAbstraction.ConnectAsync(socket, ep, cancellationToken).ConfigureAwait(false); + await SocketAbstraction.ConnectAsync(socket, endPoint, cancellationToken).ConfigureAwait(false); const int socketBufferSize = 2 * Session.MaximumSshPacketSize; socket.SendBufferSize = socketBufferSize; diff --git a/src/Renci.SshNet/Connection/DirectConnector.cs b/src/Renci.SshNet/Connection/DirectConnector.cs index f0b1d6d6..bf6db0d7 100644 --- a/src/Renci.SshNet/Connection/DirectConnector.cs +++ b/src/Renci.SshNet/Connection/DirectConnector.cs @@ -1,4 +1,5 @@ -using System.Net.Sockets; +using System.Net; +using System.Net.Sockets; using System.Threading; namespace Renci.SshNet.Connection @@ -12,12 +13,12 @@ namespace Renci.SshNet.Connection public override Socket Connect(IConnectionInfo connectionInfo) { - return SocketConnect(connectionInfo.Host, connectionInfo.Port, connectionInfo.Timeout); + return SocketConnect(new DnsEndPoint(connectionInfo.Host, connectionInfo.Port), connectionInfo.Timeout); } public override System.Threading.Tasks.Task ConnectAsync(IConnectionInfo connectionInfo, CancellationToken cancellationToken) { - return SocketConnectAsync(connectionInfo.Host, connectionInfo.Port, cancellationToken); + return SocketConnectAsync(new DnsEndPoint(connectionInfo.Host, connectionInfo.Port), cancellationToken); } } } diff --git a/src/Renci.SshNet/Connection/ISocketFactory.cs b/src/Renci.SshNet/Connection/ISocketFactory.cs index a1223318..53f9e36d 100644 --- a/src/Renci.SshNet/Connection/ISocketFactory.cs +++ b/src/Renci.SshNet/Connection/ISocketFactory.cs @@ -8,16 +8,14 @@ namespace Renci.SshNet.Connection internal interface ISocketFactory { /// - /// Creates a with the specified , - /// and that does not use the - /// Nagle algorithm. + /// Creates a with the specified + /// and that does not use the Nagle algorithm. /// - /// The . /// The . /// The . /// /// The . /// - Socket Create(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType); + Socket Create(SocketType socketType, ProtocolType protocolType); } } diff --git a/src/Renci.SshNet/Connection/ProxyConnector.cs b/src/Renci.SshNet/Connection/ProxyConnector.cs index a3f947ef..2e5b715b 100644 --- a/src/Renci.SshNet/Connection/ProxyConnector.cs +++ b/src/Renci.SshNet/Connection/ProxyConnector.cs @@ -1,4 +1,5 @@ using System; +using System.Net; using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; @@ -52,7 +53,7 @@ namespace Renci.SshNet.Connection /// public override Socket Connect(IConnectionInfo connectionInfo) { - var socket = SocketConnect(connectionInfo.ProxyHost, connectionInfo.ProxyPort, connectionInfo.Timeout); + var socket = SocketConnect(new DnsEndPoint(connectionInfo.ProxyHost, connectionInfo.ProxyPort), connectionInfo.Timeout); try { @@ -78,7 +79,7 @@ namespace Renci.SshNet.Connection /// public override async Task ConnectAsync(IConnectionInfo connectionInfo, CancellationToken cancellationToken) { - var socket = await SocketConnectAsync(connectionInfo.ProxyHost, connectionInfo.ProxyPort, cancellationToken).ConfigureAwait(false); + var socket = await SocketConnectAsync(new DnsEndPoint(connectionInfo.ProxyHost, connectionInfo.ProxyPort), cancellationToken).ConfigureAwait(false); try { diff --git a/src/Renci.SshNet/Connection/SocketFactory.cs b/src/Renci.SshNet/Connection/SocketFactory.cs index 69863494..948c9d38 100644 --- a/src/Renci.SshNet/Connection/SocketFactory.cs +++ b/src/Renci.SshNet/Connection/SocketFactory.cs @@ -7,20 +7,10 @@ namespace Renci.SshNet.Connection /// internal sealed class SocketFactory : ISocketFactory { - /// - /// Creates a with the specified , - /// and that does not use the - /// Nagle algorithm. - /// - /// The . - /// The . - /// The . - /// - /// The . - /// - public Socket Create(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType) + /// + public Socket Create(SocketType socketType, ProtocolType protocolType) { - return new Socket(addressFamily, socketType, protocolType) { NoDelay = true }; + return new Socket(socketType, protocolType) { NoDelay = true }; } } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs index 2a097619..3037134c 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs @@ -26,12 +26,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -95,7 +95,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs index 433adff4..17d98426 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs @@ -32,7 +32,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _server = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.Port)); _server.Disconnected += (socket) => _disconnected = true; @@ -42,7 +42,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -106,7 +106,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs index 7cd0f6ec..0a29d70d 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_HostNameInvalid.cs @@ -8,6 +8,7 @@ namespace Renci.SshNet.Tests.Classes.Connection public class DirectConnectorTest_Connect_HostNameInvalid : DirectConnectorTestBase { private ConnectionInfo _connectionInfo; + private Socket _clientSocket; private SocketException _actualException; protected override void SetupData() @@ -16,6 +17,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo = CreateConnectionInfo("invalid."); _actualException = null; + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void Act() @@ -31,6 +33,12 @@ namespace Renci.SshNet.Tests.Classes.Connection } } + protected override void SetupMocks() + { + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) + .Returns(_clientSocket); + } + [TestMethod] public void ConnectShouldHaveThrownSocketException() { diff --git a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs index 0aa4a9b8..82623bc3 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs @@ -33,12 +33,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -116,7 +116,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs index 5cc4e8d2..fd7d9c72 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs @@ -36,12 +36,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -105,7 +105,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs index c6b7939b..583afa14 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs @@ -39,7 +39,7 @@ namespace Renci.SshNet.Tests.Classes.Connection }; _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -52,7 +52,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -110,7 +110,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs index 8384e4d9..bf9d37d4 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs @@ -9,6 +9,7 @@ namespace Renci.SshNet.Tests.Classes.Connection { private ConnectionInfo _connectionInfo; private SocketException _actualException; + private Socket _clientSocket; protected override void SetupData() { @@ -24,6 +25,13 @@ namespace Renci.SshNet.Tests.Classes.Connection "proxyPwd", new KeyboardInteractiveAuthenticationMethod("user")); _actualException = null; + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); + } + + protected override void SetupMocks() + { + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) + .Returns(_clientSocket); } protected override void Act() diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs index e8bf537b..57ed498b 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsEmpty.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -72,7 +72,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -131,7 +131,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs index 85008204..7fcd9da8 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyPasswordIsNull.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -72,7 +72,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -131,7 +131,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs index cca8544a..e5e9107f 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseDoesNotContainHttpStatusLine.cs @@ -43,7 +43,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _bytesReceivedByProxy = new List(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -63,7 +63,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -120,7 +120,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs index f729c616..82926334 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_ExtraTextBeforeStatusLine.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -76,7 +76,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -135,7 +135,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs index 955e701a..48c86128 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_HeadersAndContent.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -76,7 +76,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -135,7 +135,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs index 7a41263c..4ce401e0 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIs200_OnlyHeaders.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -74,7 +74,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -133,7 +133,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs index fb7f7f9d..00465a93 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyResponseStatusIsNot200.cs @@ -43,7 +43,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _bytesReceivedByProxy = new List(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -63,7 +63,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -120,7 +120,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs index 453a3f71..b0efb36f 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsEmpty.cs @@ -47,7 +47,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -73,7 +73,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -126,7 +126,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs index de78270f..0b7c81cc 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNotNullAndNotEmpty.cs @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Connected += (socket) => @@ -68,7 +68,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -126,7 +126,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs index 4d9b0267..ab4da551 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyUserNameIsNull.cs @@ -47,7 +47,7 @@ namespace Renci.SshNet.Tests.Classes.Connection "\r\n"); _bytesReceivedByProxy = new List(); _disconnected = false; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -73,7 +73,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -131,7 +131,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs index fbdfeb2c..0e8b0935 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs @@ -43,12 +43,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -126,7 +126,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs index c2c56eed..45d9a59e 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs @@ -56,7 +56,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -82,7 +82,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -164,7 +164,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs index 1cd27be5..4610c521 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs @@ -46,7 +46,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += (socket) => _disconnected = true; @@ -58,7 +58,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -134,7 +134,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs index a220b942..9a169626 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionRejectedByProxy.cs @@ -30,7 +30,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd"); _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _actualException = null; _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); @@ -55,7 +55,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -113,7 +113,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs index ced5855c..5b37bfa9 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs @@ -33,7 +33,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd"); _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200)); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _actual = null; _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); @@ -73,7 +73,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -158,7 +158,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs index 7c41d93d..96e094a1 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs @@ -25,12 +25,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -94,7 +94,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs index 64976c7d..639a603c 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs @@ -30,13 +30,13 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo = CreateConnectionInfo("proxyUser", "proxyPwd"); _connectionInfo.Timeout = TimeSpan.FromMilliseconds(random.Next(50, 200)); _stopWatch = new Stopwatch(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _actualException = null; } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -114,7 +114,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs index d87969ce..efcd0252 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs @@ -36,7 +36,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -60,7 +60,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -136,7 +136,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs index 8f6ee901..92b8843e 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs @@ -36,7 +36,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -56,7 +56,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -132,7 +132,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs index c6d4c65d..fcb5ffb0 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs @@ -36,7 +36,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -48,7 +48,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -124,7 +124,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs index 05bd850d..51d6edda 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs @@ -25,12 +25,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -94,7 +94,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs index 58bfa2bb..2b793110 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs @@ -31,7 +31,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.BytesReceived += (bytesReceived, socket) => @@ -103,7 +103,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -203,7 +203,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs index 1c26de2f..6a304913 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ProxySocksVersionIsNotSupported.cs @@ -31,7 +31,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _proxySocksVersion = GetNotSupportedSocksVersion(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -44,7 +44,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -102,7 +102,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs index 964e3696..1bf0f80d 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs @@ -32,12 +32,12 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); } protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -115,7 +115,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectionReply.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectionReply.cs index 907f4ab6..40d07854 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectionReply.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectionReply.cs @@ -34,7 +34,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _stopWatch = new Stopwatch(); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.BytesReceived += (bytesReceived, socket) => @@ -57,7 +57,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -114,7 +114,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs index 74d31196..0d31e3ac 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_AuthenticationFailed.cs @@ -33,7 +33,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -71,7 +71,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -170,7 +170,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs index 3c69ac5c..50c5aad0 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_ConnectionSucceeded.cs @@ -32,7 +32,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100); _bytesReceivedByProxy = new List(); - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.BytesReceived += (bytesReceived, socket) => @@ -104,7 +104,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -217,7 +217,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs index bb300489..2ef33b2b 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_PasswordExceedsMaximumLength.cs @@ -33,7 +33,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _bytesReceivedByProxy = new List(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -58,7 +58,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -142,7 +142,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } } diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs index 83a58f89..0c847390 100644 --- a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs +++ b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_UserNamePasswordAuthentication_UserNameExceedsMaximumLength.cs @@ -33,7 +33,7 @@ namespace Renci.SshNet.Tests.Classes.Connection _bytesReceivedByProxy = new List(); _actualException = null; - _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _clientSocket = SocketFactory.Create(SocketType.Stream, ProtocolType.Tcp); _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort)); _proxyServer.Disconnected += socket => _disconnected = true; @@ -58,7 +58,7 @@ namespace Renci.SshNet.Tests.Classes.Connection protected override void SetupMocks() { - _ = SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + _ = SocketFactoryMock.Setup(p => p.Create(SocketType.Stream, ProtocolType.Tcp)) .Returns(_clientSocket); } @@ -140,7 +140,7 @@ namespace Renci.SshNet.Tests.Classes.Connection [TestMethod] public void CreateOnSocketFactoryShouldHaveBeenInvokedOnce() { - SocketFactoryMock.Verify(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp), + SocketFactoryMock.Verify(p => p.Create(SocketType.Stream, ProtocolType.Tcp), Times.Once()); } }