Skip to content

Commit 823bc1b

Browse files
Use CollectionAssert in ListDirectory tests (#1166)
* Use CollectionAssert in ListDirectory tests * Indent the braces --------- Co-authored-by: Wojciech Nagórski <[email protected]>
1 parent 5ffcb94 commit 823bc1b

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

test/Renci.SshNet.IntegrationTests/SftpClientTests.cs

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ public void Create_directory_with_contents_and_list_it()
3434
Assert.IsTrue(_sftpClient.Exists(testFilePath));
3535

3636
// Check if ListDirectory works
37-
var files = _sftpClient.ListDirectory(testDirectory);
37+
var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
38+
{
39+
("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
40+
("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
41+
("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
42+
};
43+
44+
var actualFiles = _sftpClient.ListDirectory(testDirectory)
45+
.Select(f => (f.FullName, f.IsRegularFile, f.IsDirectory))
46+
.ToList();
3847

3948
_sftpClient.DeleteFile(testFilePath);
4049
_sftpClient.DeleteDirectory(testDirectory);
4150

42-
var builder = new StringBuilder();
43-
foreach (var file in files)
44-
{
45-
builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
46-
}
47-
48-
Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
49-
/home/sshnet/sshnet-test/.. False True
50-
/home/sshnet/sshnet-test/test-file.txt True False
51-
", builder.ToString());
51+
CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
5252
}
5353

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

7171
// Check if ListDirectory works
72-
var files = _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None);
72+
var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
73+
{
74+
("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
75+
("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
76+
("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
77+
};
78+
79+
var actualFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>();
7380

74-
var builder = new StringBuilder();
75-
await foreach (var file in files)
81+
await foreach (var file in _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None))
7682
{
77-
builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
83+
actualFiles.Add((file.FullName, file.IsRegularFile, file.IsDirectory));
7884
}
7985

8086
_sftpClient.DeleteFile(testFilePath);
8187
_sftpClient.DeleteDirectory(testDirectory);
8288

83-
Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
84-
/home/sshnet/sshnet-test/.. False True
85-
/home/sshnet/sshnet-test/test-file.txt True False
86-
", builder.ToString());
89+
CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
8790
}
8891

8992
[TestMethod]

0 commit comments

Comments
 (0)