From 823bc1b67bcbce3d1e1a5a91236c77f7970055ae Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Mon, 13 Nov 2023 05:07:26 +0000 Subject: [PATCH] Use CollectionAssert in ListDirectory tests (#1166) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use CollectionAssert in ListDirectory tests * Indent the braces --------- Co-authored-by: Wojciech Nagórski --- .../SftpClientTests.cs | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs b/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs index ee0258cd..535b07bc 100644 --- a/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs +++ b/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs @@ -34,21 +34,21 @@ namespace Renci.SshNet.IntegrationTests 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] @@ -69,21 +69,24 @@ namespace Renci.SshNet.IntegrationTests 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 builder = new StringBuilder(); - await foreach (var file in files) + var actualFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>(); + + 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]