#132 ambiguous unit handling - ensure throw appropriate exception + tidyup

Author: neutmute

UnitsNet.Tests/UnitSystemTests.cs

@@ -186,14 +186,7 @@ public void Parse_AmbiguousUnitsThrowsException()
             Assert.Throws<AmbiguousUnitParseException>( ()=>unitSystem.Parse<VolumeUnit>("tsp"));
 
             // Act 2
-            try
-            {
-                Volume.Parse("1 tsp");
-            }
-            catch (UnitsNetException e)
-            {
-                Assert.True(e.InnerException is AmbiguousUnitParseException);
-            }
+            Assert.Throws<AmbiguousUnitParseException>(() => Volume.Parse("1 tsp"));
         }
 
         [TestCase("m^2", Result = AreaUnit.SquareMeter)]

UnitsNet/AmbiguousUnitParseException.cs

@@ -0,0 +1,36 @@
+// Copyright(c) 2007 Andreas Gullberg Larsen
+// https://github.com/anjdreas/UnitsNet
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace UnitsNet
+{
+    public class AmbiguousUnitParseException : UnitsNetException
+    {
+        public AmbiguousUnitParseException(string message) : base(message)
+        {
+        }
+
+        public AmbiguousUnitParseException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}

UnitsNet/CustomCode/UnitSystem.cs

@@ -32,11 +32,6 @@
 
 namespace UnitsNet
 {
-    public class AbbreviationMap : Dictionary<string, List<int>>
-    {
-        
-    }
-
     [PublicAPI]
     public partial class UnitSystem
     {
@@ -312,5 +307,13 @@ private void LoadDefaultAbbreviatons([NotNull] IFormatProvider culture)
                 }
             }
         }
+        
+        /// <summary>
+        /// Avoids having too many nested generics for code clarity
+        /// </summary>
+        class AbbreviationMap : Dictionary<string, List<int>>
+        {
+
+        }
     }
 }

UnitsNet/GeneratedCode/UnitClasses/Acceleration.g.cs

@@ -432,7 +432,11 @@ private static List<Acceleration> ParseWithRegex(string regexString, string str,
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/AmplitudeRatio.g.cs

@@ -360,7 +360,11 @@ private static List<AmplitudeRatio> ParseWithRegex(string regexString, string st
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/Angle.g.cs

@@ -492,7 +492,11 @@ private static List<Angle> ParseWithRegex(string regexString, string str, IForma
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/Area.g.cs

@@ -492,7 +492,11 @@ private static List<Area> ParseWithRegex(string regexString, string str, IFormat
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/Density.g.cs

@@ -492,7 +492,11 @@ private static List<Density> ParseWithRegex(string regexString, string str, IFor
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/Duration.g.cs

@@ -492,7 +492,11 @@ private static List<Duration> ParseWithRegex(string regexString, string str, IFo
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;

UnitsNet/GeneratedCode/UnitClasses/ElectricCurrent.g.cs

@@ -412,7 +412,11 @@ private static List<ElectricCurrent> ParseWithRegex(string regexString, string s
 
                     converted.Add(From(value, unit));
                 }
-                catch (Exception ex)
+                catch(AmbiguousUnitParseException ambiguousException)
+                {
+                    throw;
+                }
+                catch(Exception ex)
                 {
                     var newEx = new UnitsNetException("Error parsing string.", ex);
                     newEx.Data["input"] = str;