Skip to content

Commit ee7785e

Browse files
committed
Use CollectionAssert in ListDirectory tests
1 parent 004b57a commit ee7785e

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

src/Renci.SshNet.IntegrationTests/SftpClientTests.cs

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

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

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

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

5555
[TestMethod]
@@ -70,21 +70,24 @@ public async Task Create_directory_with_contents_and_list_it_async()
7070
Assert.IsTrue(_sftpClient.Exists(testFilePath));
7171

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

75-
var builder = new StringBuilder();
76-
await foreach (var file in files)
82+
await foreach (var file in _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None))
7783
{
78-
builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
84+
actualFiles.Add((file.FullName, file.IsRegularFile, file.IsDirectory));
7985
}
8086

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

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

9093
[TestMethod]

0 commit comments

Comments
 (0)