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 remaning tests.

Browse Source
This commit is contained in:
Gert Driesen
2017-02-02 20:09:35 +01:00
parent c7c6e87799
commit a51e82fcb8
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+10 -5
View File
@@ -15,6 +15,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
{
private const int ChunkLength = 32 * 1024;
private MockSequence _seq;
private byte[] _handle;
private int _fileSize;
private byte[] _chunk1;
@@ -40,9 +41,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
protected override void SetupMocks()
{
var seq = new MockSequence();
_seq = new MockSequence();
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -50,7 +51,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
asyncResult.SetAsCompleted(_chunk1, false);
})
.Returns((SftpReadAsyncResult)null);
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -65,7 +66,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
});
})
.Returns((SftpReadAsyncResult)null);
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -129,13 +130,17 @@ namespace Renci.SshNet.Tests.Classes.Sftp
}
[TestMethod]
public void DisposeShouldCompleteImmediately()
public void DisposeShouldCloseHandleAndCompleteImmediately()
{
SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
var stopwatch = Stopwatch.StartNew();
_reader.Dispose();
stopwatch.Stop();
Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
}
}
}
src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
+10 -5
View File
@@ -15,6 +15,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
{
private const int ChunkLength = 32 * 1024;
private MockSequence _seq;
private byte[] _handle;
private int _fileSize;
private byte[] _chunk1;
@@ -42,9 +43,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
protected override void SetupMocks()
{
var seq = new MockSequence();
_seq = new MockSequence();
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -52,7 +53,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
asyncResult.SetAsCompleted(_chunk1, false);
})
.Returns((SftpReadAsyncResult)null);
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -70,7 +71,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
});
})
.Returns((SftpReadAsyncResult)null);
SftpSessionMock.InSequence(seq)
SftpSessionMock.InSequence(_seq)
.Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
.Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
{
@@ -136,13 +137,17 @@ namespace Renci.SshNet.Tests.Classes.Sftp
}
[TestMethod]
public void DisposeShouldCompleteImmediately()
public void DisposeShouldCloseHandleAndCompleteImmediately()
{
SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
var stopwatch = Stopwatch.StartNew();
_reader.Dispose();
stopwatch.Stop();
Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
}
[TestMethod]