QuantityParser: Make parsing more strict

- Only parse the format "{value} {unit abbreviation}" where the spacing is optional
- No longer support parsing multiple quantities like "1 ft 2 in", use Length.ParseFeetInches() for that
- Move Trim() to inner-most level

Author: angularsen

UnitsNet.Tests/CustomCode/ParseTests.cs

@@ -38,6 +38,7 @@ public class ParseTests
     {
         [Theory]
         [InlineData("1km", 1000)]
+        [InlineData(" 1km ", 1000)] // Check that it also trims string
         [InlineData("1 km", 1000)]
         [InlineData("1e-3 km", 1)]
         [InlineData("5.5 m", 5.5)]
@@ -51,11 +52,11 @@ public void ParseLengthToMetersUsEnglish(string s, double expected)
 
         [Theory]
         [InlineData(null, typeof(ArgumentNullException))] // Can't parse null.
-        [InlineData("1", typeof(ArgumentException))] // No unit abbreviation.
-        [InlineData("km", typeof(UnitsNetException))] // No value, wrong measurement type.
-        [InlineData("1 kg", typeof(UnitsNetException))] // Wrong measurement type.
-        [InlineData("1ft monkey 1in", typeof(UnitsNetException))] // Invalid separator between two valid measurements.
-        [InlineData("1ft 1invalid", typeof(UnitsNetException))] // Valid 
+        [InlineData("1", typeof(FormatException))] // No unit abbreviation.
+        [InlineData("km", typeof(FormatException))] // No value, wrong measurement type.
+        [InlineData("1 kg", typeof(FormatException))] // Wrong measurement type.
+        [InlineData("1ft monkey 1in", typeof(FormatException))] // Invalid separator between two valid measurements.
+        [InlineData("1ft 1invalid", typeof(FormatException))] // Valid
         public void ParseLength_InvalidString_USEnglish_ThrowsException(string s, Type expectedExceptionType)
         {
             var usEnglish = new CultureInfo("en-US");
@@ -71,20 +72,24 @@ public void ParseWithCultureUsingSpaceAsThousandSeparators(string s, double expe
         {
             var numberFormat = (NumberFormatInfo) CultureInfo.InvariantCulture.NumberFormat.Clone();
             numberFormat.NumberGroupSeparator = " ";
+            numberFormat.CurrencyGroupSeparator = " ";
             numberFormat.NumberDecimalSeparator = ".";
+            numberFormat.CurrencyDecimalSeparator = ".";
 
             double actual = Length.Parse(s, numberFormat).Meters;
             Assert.Equal(expected, actual);
         }
 
         [Theory]
-        [InlineData("500.005.050,001 m", typeof(UnitsNetException))]
+        [InlineData("500.005.050,001 m", typeof(FormatException))]
         // quantity doesn't match number format
         public void ParseWithCultureUsingSpaceAsThousandSeparators_ThrowsExceptionOnInvalidString(string s, Type expectedExceptionType)
         {
             var numberFormat = (NumberFormatInfo) CultureInfo.InvariantCulture.NumberFormat.Clone();
             numberFormat.NumberGroupSeparator = " ";
+            numberFormat.CurrencyGroupSeparator = " ";
             numberFormat.NumberDecimalSeparator = ".";
+            numberFormat.CurrencyDecimalSeparator = ".";
 
             Assert.Throws(expectedExceptionType, () => Length.Parse(s, numberFormat));
         }
@@ -98,7 +103,9 @@ public void ParseWithCultureUsingDotAsThousandSeparators(string s, double expect
         {
             var numberFormat = (NumberFormatInfo) CultureInfo.InvariantCulture.NumberFormat.Clone();
             numberFormat.NumberGroupSeparator = ".";
+            numberFormat.CurrencyGroupSeparator = ".";
             numberFormat.NumberDecimalSeparator = ",";
+            numberFormat.CurrencyDecimalSeparator = ",";
 
             double actual = Length.Parse(s, numberFormat).Meters;
             Assert.Equal(expected, actual);
@@ -112,12 +119,14 @@ public void ParseMultiWordAbbreviations()
         }
 
         [Theory]
-        [InlineData("500 005 m", typeof(UnitsNetException))] // Quantity doesn't match number format.
+        [InlineData("500 005 m", typeof(FormatException))] // Quantity doesn't match number format.
         public void ParseWithCultureUsingDotAsThousandSeparators_ThrowsExceptionOnInvalidString(string s, Type expectedExceptionType)
         {
             var numberFormat = (NumberFormatInfo) CultureInfo.InvariantCulture.NumberFormat.Clone();
             numberFormat.NumberGroupSeparator = ".";
+            numberFormat.CurrencyGroupSeparator = ".";
             numberFormat.NumberDecimalSeparator = ",";
+            numberFormat.CurrencyDecimalSeparator = ",";
 
             Assert.Throws(expectedExceptionType, () => Length.Parse(s, numberFormat));
         }
@@ -142,7 +151,7 @@ public void ParseLengthUnitUsEnglish_ThrowsExceptionOnInvalidString(string s, Ty
 
         [Theory]
         [InlineData("1 m", true)]
-        [InlineData("1 m 50 cm", true)]
+        [InlineData("1 m 50 cm", false)]
         [InlineData("2 kg", false)]
         [InlineData(null, false)]
         [InlineData("foo", false)]

UnitsNet.Tests/UnitParserTests.cs

@@ -48,7 +48,7 @@ public void Parse_UnknownAbbreviationThrowsUnitNotFoundException()
         }
 
         [Fact]
-        public void ShouldUseCorrectMicroSign()
+        public void ParseUnit_ShouldUseCorrectMicroSign()
         {
             // "\u00b5" = Micro sign
             Assert.Equal(AccelerationUnit.MicrometerPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²"));
@@ -118,13 +118,5 @@ public void Parse_AmbiguousUnitsThrowsException()
             Assert.Equal("Cannot parse \"pt\" since it could be either of these: DtpPoint, PrinterPoint", exception1.Message);
             Assert.Equal("Cannot parse \"pt\" since it could be either of these: DtpPoint, PrinterPoint", exception2.Message);
         }
-
-        [Fact]
-        public void Parse_UnambiguousUnitsDoesNotThrow()
-        {
-            var unit = Volume.Parse("1 l");
-
-            Assert.Equal(Volume.FromLiters(1), unit);
-        }
     }
 }

UnitsNet/CustomCode/Quantities/Length.extra.cs

@@ -107,8 +107,9 @@ public static bool TryParseFeetInches(string str, out Length result, IFormatProv
             if (TryParseInternal(str, formatProvider, out result))
                 return true;
 
-            string footRegex = QuantityParser.CreateRegexPatternForUnit(LengthUnit.Foot, formatProvider, matchEntireString: false);
-            string inchRegex = QuantityParser.CreateRegexPatternForUnit(LengthUnit.Inch, formatProvider, matchEntireString: false);
+            var quantityParser = QuantityParser.Default;
+            string footRegex = quantityParser.CreateRegexPatternForUnit(LengthUnit.Foot, formatProvider, matchEntireString: false);
+            string inchRegex = quantityParser.CreateRegexPatternForUnit(LengthUnit.Inch, formatProvider, matchEntireString: false);
 
             // Match entire string exactly
             string pattern = $@"^(?<feet>{footRegex})\s?(?<inches>{inchRegex})$";