Skip to content

Use CollectionAssert in ListDirectory tests #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Use CollectionAssert in ListDirectory tests #1166

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
314ec57
Use CollectionAssert in ListDirectory tests
Rob-Hague Aug 30, 2023
580fdbb
Merge remote-tracking branch 'upstream/develop' into collectionassert
Rob-Hague Oct 30, 2023
cfdd813
Indent the braces
Rob-Hague Oct 30, 2023
e4fc039
Merge branch 'develop' into collectionassert
WojciechNagorski Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions test/Renci.SshNet.IntegrationTests/SftpClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ public void Create_directory_with_contents_and_list_it()
Assert.IsTrue(_sftpClient.Exists(testFilePath));

// Check if ListDirectory works
var files = _sftpClient.ListDirectory(testDirectory);
var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
{
("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
};

var actualFiles = _sftpClient.ListDirectory(testDirectory)
.Select(f => (f.FullName, f.IsRegularFile, f.IsDirectory))
.ToList();

_sftpClient.DeleteFile(testFilePath);
_sftpClient.DeleteDirectory(testDirectory);

var builder = new StringBuilder();
foreach (var file in files)
{
builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
}

Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
/home/sshnet/sshnet-test/.. False True
/home/sshnet/sshnet-test/test-file.txt True False
", builder.ToString());
CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
}

[TestMethod]
Expand All @@ -69,21 +69,24 @@ public async Task Create_directory_with_contents_and_list_it_async()
Assert.IsTrue(_sftpClient.Exists(testFilePath));

// Check if ListDirectory works
var files = _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None);
var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
{
("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
};

var actualFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>();

var builder = new StringBuilder();
await foreach (var file in files)
await foreach (var file in _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None))
{
builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
actualFiles.Add((file.FullName, file.IsRegularFile, file.IsDirectory));
}

_sftpClient.DeleteFile(testFilePath);
_sftpClient.DeleteDirectory(testDirectory);

Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
/home/sshnet/sshnet-test/.. False True
/home/sshnet/sshnet-test/test-file.txt True False
", builder.ToString());
CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
}

[TestMethod]
Expand Down