Fix review part 1

sshnet · Apr 21, 2023 · 3a4b62f · 3a4b62f
1 parent 8201be4
commit 3a4b62f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 14 deletions.
diff --git a/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs b/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -28,7 +29,7 @@ public void Ctor_PartialSuccessLimit_Zero()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(new ArgumentOutOfRangeException("partialSuccessLimit", "Cannot be less than one.").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("partialSuccessLimit", "Cannot be less than one.", ex);
                 Assert.AreEqual("partialSuccessLimit", ex.ParamName);
             }
         }
@@ -46,7 +47,7 @@ public void Ctor_PartialSuccessLimit_Negative()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(new ArgumentOutOfRangeException("partialSuccessLimit", "Cannot be less than one.").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("partialSuccessLimit", "Cannot be less than one.", ex);
                 Assert.AreEqual("partialSuccessLimit", ex.ParamName);
             }
         }

diff --git a/src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs b/src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using System;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
@@ -38,7 +39,7 @@ public void Create_ByteArrayAndIndentLevel_IndentLevelLessThanZero()
             {
                 Assert.IsNull(ex.InnerException);
 
-                Assert.AreEqual(new ArgumentOutOfRangeException("indentLevel", "Cannot be less than zero.").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("indentLevel", "Cannot be less than zero.", ex);
 
                 Assert.AreEqual("indentLevel", ex.ParamName);
             }

diff --git a/src/Renci.SshNet.Tests/Classes/Common/PosixPathTest_CreateAbsoluteOrRelativeFilePath.cs b/src/Renci.SshNet.Tests/Classes/Common/PosixPathTest_CreateAbsoluteOrRelativeFilePath.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using System;
+using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Common
 {
@@ -37,7 +38,7 @@ public void Path_Empty()
             catch (ArgumentException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(new ArgumentException("The path is a zero-length string.", "path").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("The path is a zero-length string.", "path", ex);
                 Assert.AreEqual("path", ex.ParamName);
             }
         }

diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest.cs
@@ -86,7 +86,7 @@ public void OperationTimeout_LessThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.", ex);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }
@@ -105,7 +105,7 @@ public void OperationTimeout_GreaterThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
+                ArgumentExceptionAssert.MessageEquals("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.", ex);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }

diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.cs
@@ -94,9 +94,7 @@ public void OperationTimeout_LessThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-
-                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
-
+                ArgumentExceptionAssert.MessageEquals("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.", ex);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }
@@ -115,9 +113,7 @@ public void OperationTimeout_GreaterThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-
-                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
-
+                ArgumentExceptionAssert.MessageEquals("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.", ex);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }

diff --git a/src/Renci.SshNet.Tests/Common/ArgumentExceptionAssert.cs b/src/Renci.SshNet.Tests/Common/ArgumentExceptionAssert.cs
@@ -0,0 +1,16 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Renci.SshNet.Tests.Common
+{
+    public static class ArgumentExceptionAssert
+    {
+        public static void MessageEquals(string paramName, string expected, ArgumentException exception)
+        {
+            var type = exception.GetType();
+            var newMessage = (ArgumentException)Activator.CreateInstance(type, paramName, expected);
+
+            Assert.AreEqual(newMessage?.Message, exception.Message);
+        }
+    }
+}
diff --git a/src/Renci.SshNet/ShellStream.cs b/src/Renci.SshNet/ShellStream.cs
@@ -16,6 +16,7 @@ namespace Renci.SshNet
     public class ShellStream : Stream
     {
         private const string CrLf = "\r\n";
+        private const string Cr = "\n";
 
         private readonly ISession _session;
         private readonly Encoding _encoding;
@@ -620,14 +621,14 @@ public string ReadLine(TimeSpan timeout)
                         text = _encoding.GetString(_incoming.ToArray(), 0, _incoming.Count);
                     }
 
-                    var index = text.IndexOf(CrLf, StringComparison.Ordinal);
+                    var index = text.IndexOf(Cr, StringComparison.Ordinal);
 
                     if (index >= 0)
                     {
                         text = text.Substring(0, index);
 
                         // determine how many bytes to remove from buffer
-                        var bytesProcessed = _encoding.GetByteCount(text + CrLf);
+                        var bytesProcessed = _encoding.GetByteCount(text + Cr);
 
                         // remove processed bytes from the queue
                         for (var i = 0; i < bytesProcessed; i++)