Since Dispose now also invokes Disconnect, we no longer need to explicitly invoke Disconnect.

drieseng · drieseng · commit edde414ef339 · 2016-09-11T21:09:50.000+02:00
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
@@ -45,7 +45,6 @@ protected void Arrange()
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
@@ -76,9 +75,9 @@ public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
@@ -45,7 +45,6 @@ protected void Arrange()
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -78,9 +77,9 @@ public void DisconnectOnNetConfSessionShouldBeInvokedTwice()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
@@ -45,7 +45,6 @@ protected void Arrange()
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
@@ -77,9 +76,9 @@ public void DisconnectOnNetConfSessionShouldBeInvokedOnce()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
@@ -49,7 +49,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sftpClient.Connect();
@@ -81,9 +80,9 @@ public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
@@ -49,7 +49,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sftpClient.Connect();
@@ -82,9 +81,9 @@ public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
@@ -49,7 +49,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sftpClient.Connect();
@@ -82,9 +81,9 @@ public void DisconnectOnNetConfSessionShouldNeverBeInvoked()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
@@ -40,7 +40,6 @@ protected void Arrange()
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -68,9 +67,9 @@ public void ForwardedPortShouldBeRemovedFromSshClient()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs
@@ -34,7 +34,6 @@ protected void Arrange()
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -53,9 +52,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs
@@ -34,7 +34,6 @@ protected void Arrange()
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -54,9 +53,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs
@@ -34,7 +34,6 @@ protected void Arrange()
             _serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -54,9 +53,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs b/src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs
@@ -41,7 +41,6 @@ protected void Arrange()
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
-            _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
             _sessionMock.InSequence(sequence).Setup(p => p.Dispose());
 
             _sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -83,15 +82,15 @@ public void IsConnectedShouldThrowObjectDisposedException()
         }
 
         [TestMethod]
-        public void DisconnectOnSessionShouldBeInvokedOnce()
+        public void DisconnectOnSessionShouldNeverBeInvoked()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Disconnect(), Times.Never);
         }
 
         [TestMethod]
         public void DisposeOnSessionShouldBeInvokedOnce()
         {
-            _sessionMock.Verify(p => p.Disconnect(), Times.Once);
+            _sessionMock.Verify(p => p.Dispose(), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet/BaseClient.cs b/src/Renci.SshNet/BaseClient.cs
@@ -239,7 +239,6 @@ public void Disconnect()
                 // dereference the current session here
                 Session.ErrorOccured -= Session_ErrorOccured;
                 Session.HostKeyReceived -= Session_HostKeyReceived;
-                Session.Disconnect();
                 Session.Dispose();
                 Session = null;
             }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ protected void Arrange()`
`45`	`45`	`_netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());`
`46`	`46`	`_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());`
`47`	`47`	`_netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());`
`48`		`- _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());`
`49`	`48`	`_sessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`50`	`49`	`_netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`51`	`50`
`@@ -76,9 +75,9 @@ public void DisconnectOnNetConfSessionShouldBeInvokedOnce()`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`[TestMethod]`
`79`		`- public void DisconnectOnSessionShouldBeInvokedOnce()`
	`78`	`+ public void DisconnectOnSessionShouldNeverBeInvoked()`
`80`	`79`	`{`
`81`		`- _sessionMock.Verify(p => p.Disconnect(), Times.Once);`
	`80`	`+ _sessionMock.Verify(p => p.Disconnect(), Times.Never);`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ protected void Arrange()`
`49`	`49`	`_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());`
`50`	`50`	`_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());`
`51`	`51`	`_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`52`		`- _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());`
`53`	`52`	`_sessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`54`	`53`
`55`	`54`	`_sftpClient.Connect();`
`@@ -81,9 +80,9 @@ public void DisconnectOnNetConfSessionShouldNeverBeInvoked()`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`[TestMethod]`
`84`		`- public void DisconnectOnSessionShouldBeInvokedOnce()`
	`83`	`+ public void DisconnectOnSessionShouldNeverBeInvoked()`
`85`	`84`	`{`
`86`		`- _sessionMock.Verify(p => p.Disconnect(), Times.Once);`
	`85`	`+ _sessionMock.Verify(p => p.Disconnect(), Times.Never);`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ protected void Arrange()`
`40`	`40`	`_forwardedPortMock.InSequence(sequence).Setup(p => p.Start());`
`41`	`41`	`_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());`
`42`	`42`	`_forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());`
`43`		`- _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());`
`44`	`43`	`_sessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`45`	`44`
`46`	`45`	`_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);`
`@@ -68,9 +67,9 @@ public void ForwardedPortShouldBeRemovedFromSshClient()`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`[TestMethod]`
`71`		`- public void DisconnectOnSessionShouldBeInvokedOnce()`
	`70`	`+ public void DisconnectOnSessionShouldNeverBeInvoked()`
`72`	`71`	`{`
`73`		`- _sessionMock.Verify(p => p.Disconnect(), Times.Once);`
	`72`	`+ _sessionMock.Verify(p => p.Disconnect(), Times.Never);`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ protected void Arrange()`
`34`	`34`	`_serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);`
`35`	`35`	`_sessionMock.InSequence(sequence).Setup(p => p.Connect());`
`36`	`36`	`_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());`
`37`		`- _sessionMock.InSequence(sequence).Setup(p => p.Disconnect());`
`38`	`37`	`_sessionMock.InSequence(sequence).Setup(p => p.Dispose());`
`39`	`38`
`40`	`39`	`_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);`
`@@ -53,9 +52,9 @@ public void CreateSessionOnServiceFactoryShouldBeInvokedOnce()`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`[TestMethod]`
`56`		`- public void DisconnectOnSessionShouldBeInvokedOnce()`
	`55`	`+ public void DisconnectOnSessionShouldNeverBeInvoked()`
`57`	`56`	`{`
`58`		`- _sessionMock.Verify(p => p.Disconnect(), Times.Once);`
	`57`	`+ _sessionMock.Verify(p => p.Disconnect(), Times.Never);`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`[TestMethod]`