From 314ec57028d46c53e51be9eb29e8b480276cb614 Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Wed, 30 Aug 2023 20:48:41 +0200 Subject: [PATCH 1/2] Use CollectionAssert in ListDirectory tests --- .../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 ee0258cdc..03035abc7 100644 --- a/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs +++ b/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs @@ -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] @@ -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] From cfdd813d0a5360cd68009db899fa40a96fb242fc Mon Sep 17 00:00:00 2001 From: Robert Hague Date: Mon, 30 Oct 2023 21:59:37 +0100 Subject: [PATCH 2/2] Indent the braces --- .../SftpClientTests.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs b/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs index 03035abc7..535b07bce 100644 --- a/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs +++ b/test/Renci.SshNet.IntegrationTests/SftpClientTests.cs @@ -35,11 +35,11 @@ public void Create_directory_with_contents_and_list_it() // Check if ListDirectory works 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), - }; + { + ("/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)) @@ -70,11 +70,11 @@ public async Task Create_directory_with_contents_and_list_it_async() // Check if ListDirectory works 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), - }; + { + ("/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)>();