some fixes

Author: Rob-Hague

test/Renci.SshNet.IntegrationTests/OldIntegrationTests/ScpClientTest.cs

@@ -240,7 +240,7 @@ where CalculateMD5(file) == CalculateMD5(string.Format("{0}.down", file))
 
                 scp.Disconnect();
 
-                Assert.IsTrue(result.Count() == uploadFilenames.Length);
+                Assert.AreEqual(uploadFilenames.Length, result.Count());
             }
         }
 

test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SftpClientTest.ListDirectory.cs

@@ -168,13 +168,13 @@ public void Test_Sftp_Change_Directory()
             {
                 sftp.Connect();
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet");
+                Assert.AreEqual("/home/sshnet", sftp.WorkingDirectory);
 
                 sftp.CreateDirectory("test1");
 
                 sftp.ChangeDirectory("test1");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1");
+                Assert.AreEqual("/home/sshnet/test1", sftp.WorkingDirectory);
 
                 sftp.CreateDirectory("test1_1");
                 sftp.CreateDirectory("test1_2");
@@ -186,35 +186,35 @@ public void Test_Sftp_Change_Directory()
 
                 sftp.ChangeDirectory("test1_1");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("../test1_2");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_2");
+                Assert.AreEqual("/home/sshnet/test1/test1_2", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("..");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1");
+                Assert.AreEqual("/home/sshnet/test1", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("..");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet");
+                Assert.AreEqual("/home/sshnet", sftp.WorkingDirectory);
 
                 files = sftp.ListDirectory("test1/test1_1");
 
                 Assert.IsTrue(files.First().FullName.StartsWith(string.Format("{0}/test1/test1_1", sftp.WorkingDirectory)));
 
                 sftp.ChangeDirectory("test1/test1_1");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("/home/sshnet/test1/test1_1");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("/home/sshnet/test1/test1_1/../test1_2");
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_2");
+                Assert.AreEqual("/home/sshnet/test1/test1_2", sftp.WorkingDirectory);
 
                 sftp.ChangeDirectory("../../");
 
@@ -237,13 +237,13 @@ public async Task Test_Sftp_Change_DirectoryAsync()
             {
                 await sftp.ConnectAsync(CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet");
+                Assert.AreEqual("/home/sshnet", sftp.WorkingDirectory);
 
                 await sftp.CreateDirectoryAsync("test1", CancellationToken.None).ConfigureAwait(false);
 
                 await sftp.ChangeDirectoryAsync("test1", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1");
+                Assert.AreEqual("/home/sshnet/test1", sftp.WorkingDirectory);
 
                 await sftp.CreateDirectoryAsync("test1_1", CancellationToken.None).ConfigureAwait(false);
                 await sftp.CreateDirectoryAsync("test1_2", CancellationToken.None).ConfigureAwait(false);
@@ -255,35 +255,35 @@ public async Task Test_Sftp_Change_DirectoryAsync()
 
                 await sftp.ChangeDirectoryAsync("test1_1", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("../test1_2", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_2");
+                Assert.AreEqual("/home/sshnet/test1/test1_2", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("..", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1");
+                Assert.AreEqual("/home/sshnet/test1", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("..", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet");
+                Assert.AreEqual("/home/sshnet", sftp.WorkingDirectory);
 
                 files = sftp.ListDirectory("test1/test1_1");
 
                 Assert.IsTrue(files.First().FullName.StartsWith(string.Format("{0}/test1/test1_1", sftp.WorkingDirectory)));
 
                 await sftp.ChangeDirectoryAsync("test1/test1_1", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("/home/sshnet/test1/test1_1", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_1");
+                Assert.AreEqual("/home/sshnet/test1/test1_1", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("/home/sshnet/test1/test1_1/../test1_2", CancellationToken.None).ConfigureAwait(false);
 
-                Assert.AreEqual(sftp.WorkingDirectory, "/home/sshnet/test1/test1_2");
+                Assert.AreEqual("/home/sshnet/test1/test1_2", sftp.WorkingDirectory);
 
                 await sftp.ChangeDirectoryAsync("../../", CancellationToken.None).ConfigureAwait(false);
 

test/Renci.SshNet.IntegrationTests/TestInitializer.cs

@@ -1,7 +1,7 @@
 namespace Renci.SshNet.IntegrationTests
 {
     [TestClass]
-    public class TestInitializer
+    public static class TestInitializer
     {
         [AssemblyInitialize]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "MSTests requires context parameter")]

test/Renci.SshNet.Tests/Classes/Common/ChannelDataEventArgsTest.cs

@@ -65,9 +65,9 @@ public void Ctor_ProtocolVersionAndSoftwareVersionAndComments()
             const string comments = "Beware, dangerous!";
 
             var sshIdentification = new SshIdentification(protocolVersion, softwareVersion, comments);
-            Assert.AreSame(protocolVersion, sshIdentification.ProtocolVersion);
-            Assert.AreSame(softwareVersion, sshIdentification.SoftwareVersion);
-            Assert.AreSame(comments, sshIdentification.Comments);
+            Assert.AreEqual(protocolVersion, sshIdentification.ProtocolVersion);
+            Assert.AreEqual(softwareVersion, sshIdentification.SoftwareVersion);
+            Assert.AreEqual(comments, sshIdentification.Comments);
         }
 
         [TestMethod]
@@ -78,9 +78,9 @@ public void Ctor_ProtocolVersionAndSoftwareVersionAndComments_CommentsIsNull()
             const string comments = null;
 
             var sshIdentification = new SshIdentification(protocolVersion, softwareVersion, comments);
-            Assert.AreSame(protocolVersion, sshIdentification.ProtocolVersion);
-            Assert.AreSame(softwareVersion, sshIdentification.SoftwareVersion);
-            Assert.IsNull(comments, sshIdentification.Comments);
+            Assert.AreEqual(protocolVersion, sshIdentification.ProtocolVersion);
+            Assert.AreEqual(softwareVersion, sshIdentification.SoftwareVersion);
+            Assert.IsNull(sshIdentification.Comments);
         }
 
         [TestMethod]

test/Renci.SshNet.Tests/Classes/Common/ChannelEventArgsTest.cs

@@ -24,7 +24,7 @@ public void Test_KeyExchangeInitMessage_Load()
             m.Load(input);
 
             Assert.IsFalse(m.FirstKexPacketFollows);
-            Assert.IsTrue(m.Reserved == 0);
+            Assert.AreEqual(0u, m.Reserved);
             Assert.IsTrue(m.CompressionAlgorithmsClientToServer.SequenceEqual(new[] { "none", "[email protected]" }));
             Assert.IsTrue(m.CompressionAlgorithmsServerToClient.SequenceEqual(new[] { "none", "[email protected]" }));
             Assert.IsTrue(m.EncryptionAlgorithmsClientToServer.SequenceEqual(new[] { "aes128-ctr", "aes192-ctr", "aes256-ctr", "arcfour256", "arcfour128", "aes128-cbc", "3des-cbc", "blowfish-cbc", "cast128-cbc", "aes192-cbc", "aes256-cbc", "arcfour", "[email protected]" }));

test/Renci.SshNet.Tests/Classes/Common/ChannelOpenFailedEventArgsTest.cs

@@ -21,7 +21,6 @@
 
 namespace Renci.SshNet.Tests.Classes
 {
-    [TestClass]
     public abstract class SessionTest_ConnectedBase
     {
         internal Mock<IServiceFactory> ServiceFactoryMock { get; private set; }