Merge pull request #63 from cake-contrib/feature/gh-62

(GH-62) Ignore if preamble should be skipped but does not exist
cake-contrib · Sep 4, 2018 · 171a0e4 · 171a0e4
2 parents ee55d9c + c0ccd1f
commit 171a0e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/Cake.Issues.Tests/ByteArrayExtensionsTests.cs b/src/Cake.Issues.Tests/ByteArrayExtensionsTests.cs
@@ -56,17 +56,17 @@ public void Should_Throw_If_Value_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Preamble_Should_Be_Skipped_But_No_Preamble_Passed()
+            public void Should_Ignore_If_Preamble_Should_Be_Skipped_But_No_Preamble_Passed()
             {
                 // Given
                 var stringValue = "foo🐱bar";
                 var byteArrayValue = stringValue.ToByteArray();
 
                 // When
-                var result = Record.Exception(() => byteArrayValue.ToStringUsingEncoding(true));
+                var result = byteArrayValue.ToStringUsingEncoding(true);
 
                 // Then
-                result.IsArgumentException("value");
+                result.ShouldBe(stringValue);
             }
 
             [Theory]
@@ -131,18 +131,18 @@ public void Should_Throw_If_Value_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Preamble_Should_Be_Skipped_But_No_Preamble_Passed()
+            public void Should_Ignore_If_Preamble_Should_Be_Skipped_But_No_Preamble_Passed()
             {
                 // Given
                 var encoding = Encoding.UTF32;
                 var stringValue = "foo🐱bar";
                 var byteArrayValue = stringValue.ToByteArray(encoding);
 
                 // When
-                var result = Record.Exception(() => byteArrayValue.ToStringUsingEncoding(encoding, true));
+                var result = byteArrayValue.ToStringUsingEncoding(encoding, true);
 
                 // Then
-                result.IsArgumentException("value");
+                result.ShouldBe(stringValue);
             }
 
             [Theory]

diff --git a/src/Cake.Issues/ByteArrayExtensions.cs b/src/Cake.Issues/ByteArrayExtensions.cs
@@ -49,12 +49,10 @@ public static string ToStringUsingEncoding(this byte[] value, Encoding encoding,
             {
                 var preamble = encoding.GetPreamble();
 
-                if (preamble.Where((p, i) => p != value[i]).Any())
+                if (value.Zip(preamble, (x, y) => x == y).All(x => x))
                 {
-                    throw new ArgumentException("Value contains no preamble.", nameof(value));
+                    value = value.Skip(preamble.Length).ToArray();
                 }
-
-                value = value.Skip(preamble.Length).ToArray();
             }
 
             return encoding.GetString(value);