gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-10 17:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix IDE0031

Browse Source 
https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0031
This commit is contained in:
Marius Thesing
2025-07-15 20:49:18 +02:00
parent 8ca64e65dd
commit cd391cb666
58 changed files with 182 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet/NetConfClient.cs
+2 -5
View File
@@ -299,11 +299,8 @@ namespace Renci.SshNet
if (disposing)
{
if (_netConfSession != null)
{
_netConfSession.Dispose();
_netConfSession = null;
}
_netConfSession?.Dispose();
_netConfSession = null;
}
}
src/Renci.SshNet/Netconf/NetConfSession.cs
+4 -10
View File
@@ -213,17 +213,11 @@ namespace Renci.SshNet.NetConf
if (disposing)
{
if (_serverCapabilitiesConfirmed != null)
{
_serverCapabilitiesConfirmed.Dispose();
_serverCapabilitiesConfirmed = null;
}
_serverCapabilitiesConfirmed?.Dispose();
_serverCapabilitiesConfirmed = null;
if (_rpcReplyReceived != null)
{
_rpcReplyReceived.Dispose();
_rpcReplyReceived = null;
}
_rpcReplyReceived?.Dispose();
_rpcReplyReceived = null;
}
}
}
src/Renci.SshNet/Session.cs
+4 -10
View File
@@ -1570,17 +1570,11 @@ namespace Renci.SshNet
disposableClientCipher.Dispose();
}
if (_serverMac != null)
{
_serverMac.Dispose();
_serverMac = null;
}
_serverMac?.Dispose();
_serverMac = null;
if (_clientMac != null)
{
_clientMac.Dispose();
_clientMac = null;
}
_clientMac?.Dispose();
_clientMac = null;
// Update negotiated algorithms
_serverCipher = _keyExchange.CreateServerCipher(out _serverAead);
src/Renci.SshNet/SshClient.cs
+2 -5
View File
@@ -325,11 +325,8 @@ namespace Renci.SshNet
if (disposing)
{
if (_inputStream != null)
{
_inputStream.Dispose();
_inputStream = null;
}
_inputStream?.Dispose();
_inputStream = null;
_isDisposed = true;
}
test/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
+4 -10
View File
@@ -47,17 +47,11 @@ namespace Renci.SshNet.Tests.Classes.Channels
[TestCleanup]
public void CleanUp()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
_client?.Dispose();
_client = null;
if (_listener != null)
{
_listener.Stop();
_listener = null;
}
_listener?.Stop();
_listener = null;
}
private void Arrange()
test/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
+6 -15
View File
@@ -47,23 +47,14 @@ namespace Renci.SshNet.Tests.Classes.Channels
[TestCleanup]
public void CleanUp()
{
if (_remoteListener != null)
{
_remoteListener.Stop();
_remoteListener = null;
}
_remoteListener?.Stop();
_remoteListener = null;
if (_channelThread != null)
{
_channelThread.Join();
_channelThread = null;
}
_channelThread?.Join();
_channelThread = null;
if (_channel != null)
{
_channel.Dispose();
_channel = null;
}
_channel?.Dispose();
_channel = null;
}
private void Arrange()
test/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs
+2 -5
View File
@@ -31,11 +31,8 @@ namespace Renci.SshNet.Tests.Classes.Channels
[TestCleanup]
public void TearDown()
{
if (_channelClosedEventHandlerCompleted != null)
{
_channelClosedEventHandlerCompleted.Dispose();
_channelClosedEventHandlerCompleted = null;
}
_channelClosedEventHandlerCompleted?.Dispose();
_channelClosedEventHandlerCompleted = null;
}
protected override void SetupData()
test/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofReceived.cs
+6 -15
View File
@@ -91,23 +91,14 @@ namespace Renci.SshNet.Tests.Classes.Channels
[TestCleanup]
public void TearDown()
{
if (_channelClosedReceived != null)
{
_channelClosedReceived.Dispose();
_channelClosedReceived = null;
}
_channelClosedReceived?.Dispose();
_channelClosedReceived = null;
if (_raiseChannelCloseReceivedThread != null)
{
_raiseChannelCloseReceivedThread.Join();
_raiseChannelCloseReceivedThread = null;
}
_raiseChannelCloseReceivedThread?.Join();
_raiseChannelCloseReceivedThread = null;
if (_channelClosedEventHandlerCompleted != null)
{
_channelClosedEventHandlerCompleted.Dispose();
_channelClosedEventHandlerCompleted = null;
}
_channelClosedEventHandlerCompleted?.Dispose();
_channelClosedEventHandlerCompleted = null;
}
protected override void Arrange()
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs
+2 -5
View File
@@ -38,11 +38,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs
+2 -5
View File
@@ -38,11 +38,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs
+2 -5
View File
@@ -37,11 +37,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_EmptySoftwareVersion.cs
+2 -5
View File
@@ -38,11 +38,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs
+2 -5
View File
@@ -37,11 +37,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_TerminatedByLineFeedWithoutCarriageReturn.cs
+2 -5
View File
@@ -37,11 +37,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs
+4 -10
View File
@@ -37,17 +37,11 @@ namespace Renci.SshNet.Tests.Classes.Connection
[TestCleanup]
public void Cleanup()
{
if (_server != null)
{
_server.Dispose();
_server = null;
}
_server?.Dispose();
_server = null;
if (_client != null)
{
_client.Close();
_client = null;
}
_client?.Close();
_client = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortDisposed.cs
+2 -5
View File
@@ -24,11 +24,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortNeverStarted.cs
+2 -5
View File
@@ -32,11 +32,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStarted_ChannelBound.cs
+8 -20
View File
@@ -46,26 +46,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
if (_channelBindStarted != null)
{
_channelBindStarted.Dispose();
_channelBindStarted = null;
}
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
_channelBindStarted?.Dispose();
_channelBindStarted = null;
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
private void CreateMocks()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStarted_ChannelNotBound.cs
+4 -10
View File
@@ -38,16 +38,10 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStopped.cs
+2 -5
View File
@@ -32,11 +32,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_SessionErrorOccurred_ChannelBound.cs
+8 -20
View File
@@ -47,26 +47,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
if (_channelBindStarted != null)
{
_channelBindStarted.Dispose();
_channelBindStarted = null;
}
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
_channelBindStarted?.Dispose();
_channelBindStarted = null;
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
private void CreateMocks()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Start_PortDisposed.cs
+2 -5
View File
@@ -25,11 +25,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Start_PortNeverStarted.cs
+2 -5
View File
@@ -34,11 +34,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Start_PortStarted.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Start_PortStopped.cs
+2 -5
View File
@@ -34,11 +34,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Start_SessionNull.cs
+2 -5
View File
@@ -28,11 +28,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Started_SocketSendShutdownImmediately.cs
+2 -5
View File
@@ -59,11 +59,8 @@ namespace Renci.SshNet.Tests.Classes
}
}
if (_channelDisposed != null)
{
_channelDisposed.Dispose();
_channelDisposed = null;
}
_channelDisposed?.Dispose();
_channelDisposed = null;
}
private void SetupData()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Started_SocketVersionNotSupported.cs
+4 -10
View File
@@ -45,17 +45,11 @@ namespace Renci.SshNet.Tests.Classes
_forwardedPort.Stop();
}
if (_client != null)
{
_client.Close();
_client = null;
}
_client?.Close();
_client = null;
if (_exceptionFired != null)
{
_exceptionFired.Dispose();
_exceptionFired = null;
}
_exceptionFired?.Dispose();
_exceptionFired = null;
}
private void SetupData()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortDisposed.cs
+2 -5
View File
@@ -27,11 +27,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortNeverStarted.cs
+2 -5
View File
@@ -27,11 +27,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStarted_ChannelBound.cs
+8 -20
View File
@@ -45,26 +45,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
if (_channelBindStarted != null)
{
_channelBindStarted.Dispose();
_channelBindStarted = null;
}
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
_channelBindStarted?.Dispose();
_channelBindStarted = null;
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
private void CreateMocks()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStarted_ChannelNotBound.cs
+4 -10
View File
@@ -38,16 +38,10 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStopped.cs
+2 -5
View File
@@ -32,11 +32,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortDisposed.cs
+2 -5
View File
@@ -30,11 +30,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortDisposed_NeverStarted.cs
+2 -5
View File
@@ -24,11 +24,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortNeverStarted.cs
+2 -5
View File
@@ -33,11 +33,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortStarted_ChannelBound.cs
+8 -20
View File
@@ -40,26 +40,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
if (_channelBindStarted != null)
{
_channelBindStarted.Dispose();
_channelBindStarted = null;
}
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
_channelBindStarted?.Dispose();
_channelBindStarted = null;
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortStarted_ChannelNotBound.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Dispose_PortStopped.cs
+2 -5
View File
@@ -33,11 +33,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Start_PortDisposed.cs
+2 -5
View File
@@ -28,11 +28,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Start_PortNeverStarted.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Start_PortStarted.cs
+2 -5
View File
@@ -36,11 +36,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Start_PortStopped.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortDisposed.cs
+2 -5
View File
@@ -24,11 +24,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortStarted_ChannelBound.cs
+8 -20
View File
@@ -40,26 +40,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_client != null)
{
_client.Dispose();
_client = null;
}
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
if (_channelBound != null)
{
_channelBound.Dispose();
_channelBound = null;
}
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_client?.Dispose();
_client = null;
_forwardedPort?.Dispose();
_forwardedPort = null;
_channelBound?.Dispose();
_channelBound = null;
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
private void CreateMocks()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortStarted_ChannelNotBound.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortStopped.cs
+2 -5
View File
@@ -33,11 +33,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Dispose_PortDisposed.cs
+2 -5
View File
@@ -27,11 +27,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Dispose_PortNeverStarted.cs
+2 -5
View File
@@ -35,11 +35,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Dispose_PortStarted_ChannelBound.cs
+6 -15
View File
@@ -49,23 +49,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (ForwardedPort != null)
{
ForwardedPort.Dispose();
ForwardedPort = null;
}
ForwardedPort?.Dispose();
ForwardedPort = null;
if (_channelBindStarted != null)
{
_channelBindStarted.Dispose();
_channelBindStarted = null;
}
_channelBindStarted?.Dispose();
_channelBindStarted = null;
if (_channelBindCompleted != null)
{
_channelBindCompleted.Dispose();
_channelBindCompleted = null;
}
_channelBindCompleted?.Dispose();
_channelBindCompleted = null;
}
private void CreateMocks()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Dispose_PortStopped.cs
+2 -5
View File
@@ -37,11 +37,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (ForwardedPort != null)
{
ForwardedPort.Dispose();
ForwardedPort = null;
}
ForwardedPort?.Dispose();
ForwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Start_PortDisposed.cs
+2 -5
View File
@@ -28,11 +28,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Start_SessionNull.cs
+2 -5
View File
@@ -28,11 +28,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Stop_PortDisposed.cs
+2 -5
View File
@@ -27,11 +27,8 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void Cleanup()
{
if (_forwardedPort != null)
{
_forwardedPort.Dispose();
_forwardedPort = null;
}
_forwardedPort?.Dispose();
_forwardedPort = null;
}
protected void Arrange()
test/Renci.SshNet.Tests/Classes/SessionTest_ConnectedBase.cs
+8 -20
View File
@@ -66,23 +66,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void TearDown()
{
if (ServerListener != null)
{
ServerListener.Dispose();
ServerListener = null;
}
ServerListener?.Dispose();
ServerListener = null;
if (ServerSocket != null)
{
ServerSocket.Dispose();
ServerSocket = null;
}
ServerSocket?.Dispose();
ServerSocket = null;
if (Session != null)
{
Session.Dispose();
Session = null;
}
Session?.Dispose();
Session = null;
if (ClientSocket != null && ClientSocket.Connected)
{
@@ -90,11 +81,8 @@ namespace Renci.SshNet.Tests.Classes
ClientSocket.Dispose();
}
if (FirstKexReceived != null)
{
FirstKexReceived.Dispose();
FirstKexReceived = null;
}
FirstKexReceived?.Dispose();
FirstKexReceived = null;
}
protected virtual void SetupData()
test/Renci.SshNet.Tests/Classes/SessionTest_ConnectingBase.cs
+6 -15
View File
@@ -79,23 +79,14 @@ namespace Renci.SshNet.Tests.Classes
[TestCleanup]
public void TearDown()
{
if (ServerListener != null)
{
ServerListener.Dispose();
ServerListener = null;
}
ServerListener?.Dispose();
ServerListener = null;
if (ServerSocket != null)
{
ServerSocket.Dispose();
ServerSocket = null;
}
ServerSocket?.Dispose();
ServerSocket = null;
if (Session != null)
{
Session.Dispose();
Session = null;
}
Session?.Dispose();
Session = null;
if (ClientSocket != null && ClientSocket.Connected)
{
test/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
+2 -5
View File
@@ -90,11 +90,8 @@ namespace Renci.SshNet.Tests.Common
_listener?.Dispose();
if (_receiveThread != null)
{
_receiveThread.Join();
_receiveThread = null;
}
_receiveThread?.Join();
_receiveThread = null;
}
public void Dispose()