-
-
Notifications
You must be signed in to change notification settings - Fork 940
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure keep-alive timer is created when KeepAliveInterval is set afte…
…r the connection has been established. Fixes issue #334.
- Loading branch information
Showing
9 changed files
with
523 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NegativeOne.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| using System; | ||
| using System.Threading; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using Moq; | ||
| using Renci.SshNet.Messages.Transport; | ||
|
|
||
| namespace Renci.SshNet.Tests.Classes | ||
| { | ||
| [TestClass] | ||
| public class BaseClientTest_Connected_KeepAliveInterval_NegativeOne | ||
| { | ||
| private Mock<IServiceFactory> _serviceFactoryMock; | ||
| private Mock<ISession> _sessionMock; | ||
| private BaseClient _client; | ||
| private ConnectionInfo _connectionInfo; | ||
| private TimeSpan _keepAliveInterval; | ||
| private int _keepAliveCount; | ||
|
|
||
| [TestInitialize] | ||
| public void Setup() | ||
| { | ||
| Arrange(); | ||
| Act(); | ||
| } | ||
|
|
||
| [TestCleanup] | ||
| public void Cleanup() | ||
| { | ||
| if (_client != null) | ||
| { | ||
| _sessionMock.Setup(p => p.OnDisconnecting()); | ||
| _sessionMock.Setup(p => p.Dispose()); | ||
| _client.Dispose(); | ||
| } | ||
| } | ||
|
|
||
| private void SetupData() | ||
| { | ||
| _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd")); | ||
| _keepAliveInterval = TimeSpan.FromMilliseconds(100d); | ||
| _keepAliveCount = 0; | ||
| } | ||
|
|
||
| private void CreateMocks() | ||
| { | ||
| _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict); | ||
| _sessionMock = new Mock<ISession>(MockBehavior.Strict); | ||
| } | ||
|
|
||
| private void SetupMocks() | ||
| { | ||
| _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo)) | ||
| .Returns(_sessionMock.Object); | ||
| _sessionMock.Setup(p => p.Connect()); | ||
| _sessionMock.Setup(p => p.IsConnected).Returns(true); | ||
| _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>())) | ||
| .Returns(true) | ||
| .Callback(() => Interlocked.Increment(ref _keepAliveCount)); | ||
| } | ||
|
|
||
| protected void Arrange() | ||
| { | ||
| SetupData(); | ||
| CreateMocks(); | ||
| SetupMocks(); | ||
|
|
||
| _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object); | ||
| _client.Connect(); | ||
| _client.KeepAliveInterval = _keepAliveInterval; | ||
| } | ||
|
|
||
| protected void Act() | ||
| { | ||
| // allow keep-alive to be sent once | ||
| Thread.Sleep(150); | ||
|
|
||
| // disable keep-alive | ||
| _client.KeepAliveInterval = TimeSpan.FromMilliseconds(-1); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void KeepAliveIntervalShouldReturnConfiguredValue() | ||
| { | ||
| Assert.AreEqual(TimeSpan.FromMilliseconds(-1), _client.KeepAliveInterval); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void CreateSessionOnServiceFactoryShouldBeInvokedOnce() | ||
| { | ||
| _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ConnectOnSessionShouldBeInvokedOnce() | ||
| { | ||
| _sessionMock.Verify(p => p.Connect(), Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void IsConnectedOnSessionShouldBeInvokedOnce() | ||
| { | ||
| _sessionMock.Verify(p => p.IsConnected, Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void SendMessageOnSessionShouldBeInvokedThreeTimes() | ||
| { | ||
| // allow keep-alive to be sent once | ||
| Thread.Sleep(100); | ||
|
|
||
| _sessionMock.Verify(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()), Times.Exactly(1)); | ||
| } | ||
|
|
||
| private class MyClient : BaseClient | ||
| { | ||
| public MyClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, IServiceFactory serviceFactory) : base(connectionInfo, ownsConnectionInfo, serviceFactory) | ||
| { | ||
| } | ||
| } | ||
| } | ||
| } |
116 changes: 116 additions & 0 deletions
116
src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| using System; | ||
| using System.Threading; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using Moq; | ||
| using Renci.SshNet.Messages.Transport; | ||
|
|
||
| namespace Renci.SshNet.Tests.Classes | ||
| { | ||
| [TestClass] | ||
| public class BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne | ||
| { | ||
| private Mock<IServiceFactory> _serviceFactoryMock; | ||
| private Mock<ISession> _sessionMock; | ||
| private BaseClient _client; | ||
| private ConnectionInfo _connectionInfo; | ||
| private TimeSpan _keepAliveInterval; | ||
| private int _keepAliveCount; | ||
|
|
||
| [TestInitialize] | ||
| public void Setup() | ||
| { | ||
| Arrange(); | ||
| Act(); | ||
| } | ||
|
|
||
| [TestCleanup] | ||
| public void Cleanup() | ||
| { | ||
| if (_client != null) | ||
| { | ||
| _sessionMock.Setup(p => p.OnDisconnecting()); | ||
| _sessionMock.Setup(p => p.Dispose()); | ||
| _client.Dispose(); | ||
| } | ||
| } | ||
|
|
||
| private void SetupData() | ||
| { | ||
| _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd")); | ||
| _keepAliveInterval = TimeSpan.FromMilliseconds(50d); | ||
| _keepAliveCount = 0; | ||
| } | ||
|
|
||
| private void CreateMocks() | ||
| { | ||
| _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict); | ||
| _sessionMock = new Mock<ISession>(MockBehavior.Strict); | ||
| } | ||
|
|
||
| private void SetupMocks() | ||
| { | ||
| _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo)) | ||
| .Returns(_sessionMock.Object); | ||
| _sessionMock.Setup(p => p.Connect()); | ||
| _sessionMock.Setup(p => p.IsConnected).Returns(true); | ||
| _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>())) | ||
| .Returns(true) | ||
| .Callback(() => Interlocked.Increment(ref _keepAliveCount)); | ||
| } | ||
|
|
||
| protected void Arrange() | ||
| { | ||
| SetupData(); | ||
| CreateMocks(); | ||
| SetupMocks(); | ||
|
|
||
| _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object); | ||
| _client.Connect(); | ||
| } | ||
|
|
||
| protected void Act() | ||
| { | ||
| _client.KeepAliveInterval = _keepAliveInterval; | ||
|
|
||
| // allow keep-alive to be sent a few times | ||
| Thread.Sleep(195); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void KeepAliveIntervalShouldReturnConfiguredValue() | ||
| { | ||
| Assert.AreEqual(_keepAliveInterval, _client.KeepAliveInterval); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void CreateSessionOnServiceFactoryShouldBeInvokedOnce() | ||
| { | ||
| _serviceFactoryMock.Verify(p => p.CreateSession(_connectionInfo), Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ConnectOnSessionShouldBeInvokedOnce() | ||
| { | ||
| _sessionMock.Verify(p => p.Connect(), Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void IsConnectedOnSessionShouldBeInvokedOnce() | ||
| { | ||
| _sessionMock.Verify(p => p.IsConnected, Times.Once); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void SendMessageOnSessionShouldBeInvokedThreeTimes() | ||
| { | ||
| _sessionMock.Verify(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()), Times.Exactly(3)); | ||
| } | ||
|
|
||
| private class MyClient : BaseClient | ||
| { | ||
| public MyClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, IServiceFactory serviceFactory) : base(connectionInfo, ownsConnectionInfo, serviceFactory) | ||
| { | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.