Fail parse for invalid suffix; unify tests

Humanizr · May 3, 2021 · d4972e0 · d4972e0
1 parent 9159cbe
commit d4972e0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/Humanizer.Tests.Shared/Bytes/ParsingTests.cs b/src/Humanizer.Tests.Shared/Bytes/ParsingTests.cs
@@ -37,6 +37,12 @@ public void Parse()
             Assert.Equal(ByteSize.FromKilobytes(1020), ByteSize.Parse("1020KB"));
         }
 
+        [Fact]
+        public void TryParseThrowsOnNull()
+        {
+            Assert.Throws<ArgumentNullException>(() => { ByteSize.TryParse(null, out var result); });
+        }
+
         [Fact]
         public void TryParse()
         {
@@ -89,13 +95,18 @@ public void ParseDecimalMegabytes()
         [Theory]
         [InlineData("Unexpected Value")]
         [InlineData("1000")]
+        [InlineData(" 1000 ")]
         [InlineData("KB")]
+        [InlineData("1000.5b")] // Partial bits
+        [InlineData("1000KBB")] // Bad suffix
         public void TryParseReturnsFalseOnBadValue(string input)
         {
             var resultBool = ByteSize.TryParse(input, out var resultByteSize);
 
             Assert.False(resultBool);
             Assert.Equal(new ByteSize(), resultByteSize);
+
+            Assert.Throws<FormatException>(() => { ByteSize.Parse(input); });
         }
 
         [Fact]
@@ -104,18 +115,6 @@ public void TryParseWorksWithLotsOfSpaces()
             Assert.Equal(ByteSize.FromKilobytes(100), ByteSize.Parse(" 100 KB "));
         }
 
-        [Fact]
-        public void ParseThrowsOnPartialBits()
-        {
-            Assert.Throws<FormatException>(() => { ByteSize.Parse("10.5b"); });
-        }
-
-        [Fact]
-        public void ParseThrowsOnInvalid()
-        {
-            Assert.Throws<FormatException>(() => { ByteSize.Parse("Unexpected Value"); });
-        }
-
         [Fact]
         public void ParseThrowsOnNull()
         {

diff --git a/src/Humanizer/Bytes/ByteSize.cs b/src/Humanizer/Bytes/ByteSize.cs
@@ -561,6 +561,9 @@ public static bool TryParse(string s, IFormatProvider formatProvider, out ByteSi
                 case TerabyteSymbol:
                     result = FromTerabytes(number);
                     break;
+
+                default:
+                    return false;
             }
 
             return true;