Skip to content

Commit 3bd1b4e

Browse files
committed
Modify tests to take into account fact that we no longer explicitly disconnect the SftpSession, but instead immediately dispose it.
1 parent 35c9ecf commit 3bd1b4e

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ protected void Arrange()
4848
.Returns(_sftpSessionMock.Object);
4949
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
5050
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
51-
_sftpSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5251
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
5352
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5453
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -76,9 +75,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
7675
}
7776

7877
[TestMethod]
79-
public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
78+
public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
8079
{
81-
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Once);
80+
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Never);
8281
}
8382

8483
[TestMethod]

src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ protected void Arrange()
4848
.Returns(_sftpSessionMock.Object);
4949
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
5050
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
51-
_sftpSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5251
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
5352
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5453
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -77,9 +76,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
7776
}
7877

7978
[TestMethod]
80-
public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
79+
public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
8180
{
82-
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Once);
81+
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Never);
8382
}
8483

8584
[TestMethod]

src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ protected void Arrange()
4848
.Returns(_sftpSessionMock.Object);
4949
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
5050
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
51-
_sftpSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5251
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
5352
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
5453
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -77,9 +76,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
7776
}
7877

7978
[TestMethod]
80-
public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
79+
public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
8180
{
82-
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Once);
81+
_sftpSessionMock.Verify(p => p.Disconnect(), Times.Never);
8382
}
8483

8584
[TestMethod]

0 commit comments

Comments
 (0)