Added nullable overload on .From()

Author: Erik Ovegard

UnitsNet.Serialization.JsonNet/UnitsNetJsonConverter.cs

@@ -93,7 +93,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             object unit = Enum.Parse(reflectedUnitEnumType, unitEnumValue);
 
             // Mass.From() method, assume no overloads exist
-            MethodInfo fromMethod = reflectedUnitType.GetMethod("From");
+            MethodInfo fromMethod = (from m in reflectedUnitType.GetMethods()
+                                     where m.Name.Equals("From", StringComparison.InvariantCulture) &&
+                                     !m.ReturnType.IsGenericType  // we want the non nullable type
+                                     select m).Single();
 
             // Ex: Mass.From(55, MassUnit.Gram)
             // TODO: there is a possible loss of precision if base value requires higher precision than double can represent.

UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs

@@ -207,6 +207,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(meterpersecondsquared.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            Acceleration? meterpersecondsquared = Acceleration.From(null,AccelerationUnit.MeterPerSecondSquared);
+            Assert.IsTrue(meterpersecondsquared.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            Acceleration? meterpersecondsquared = Acceleration.From(value,AccelerationUnit.MeterPerSecondSquared);
+            Assert.IsTrue(meterpersecondsquared.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/AmplitudeRatioTestsBase.g.cs

@@ -187,6 +187,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(decibelvolt.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            AmplitudeRatio? decibelvolt = AmplitudeRatio.From(null,AmplitudeRatioUnit.DecibelVolt);
+            Assert.IsTrue(decibelvolt.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            AmplitudeRatio? decibelvolt = AmplitudeRatio.From(value,AmplitudeRatioUnit.DecibelVolt);
+            Assert.IsTrue(decibelvolt.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/AngleTestsBase.g.cs

@@ -225,6 +225,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(degree.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            Angle? degree = Angle.From(null,AngleUnit.Degree);
+            Assert.IsTrue(degree.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            Angle? degree = Angle.From(value,AngleUnit.Degree);
+            Assert.IsTrue(degree.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/AreaTestsBase.g.cs

@@ -225,6 +225,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(squaremeter.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            Area? squaremeter = Area.From(null,AreaUnit.SquareMeter);
+            Assert.IsTrue(squaremeter.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            Area? squaremeter = Area.From(value,AreaUnit.SquareMeter);
+            Assert.IsTrue(squaremeter.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/DensityTestsBase.g.cs

@@ -225,6 +225,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(kilogrampercubicmeter.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            Density? kilogrampercubicmeter = Density.From(null,DensityUnit.KilogramPerCubicMeter);
+            Assert.IsTrue(kilogrampercubicmeter.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            Density? kilogrampercubicmeter = Density.From(value,DensityUnit.KilogramPerCubicMeter);
+            Assert.IsTrue(kilogrampercubicmeter.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/DurationTestsBase.g.cs

@@ -225,6 +225,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(second.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            Duration? second = Duration.From(null,DurationUnit.Second);
+            Assert.IsTrue(second.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            Duration? second = Duration.From(value,DurationUnit.Second);
+            Assert.IsTrue(second.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/ElectricCurrentTestsBase.g.cs

@@ -201,6 +201,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(ampere.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            ElectricCurrent? ampere = ElectricCurrent.From(null,ElectricCurrentUnit.Ampere);
+            Assert.IsTrue(ampere.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            ElectricCurrent? ampere = ElectricCurrent.From(value,ElectricCurrentUnit.Ampere);
+            Assert.IsTrue(ampere.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/ElectricPotentialTestsBase.g.cs

@@ -195,6 +195,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(volt.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            ElectricPotential? volt = ElectricPotential.From(null,ElectricPotentialUnit.Volt);
+            Assert.IsTrue(volt.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            ElectricPotential? volt = ElectricPotential.From(value,ElectricPotentialUnit.Volt);
+            Assert.IsTrue(volt.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {

UnitsNet.Tests/GeneratedCode/ElectricResistanceTestsBase.g.cs

@@ -183,6 +183,21 @@ public void StaticConstructorWithNullReturnsNull()
             Assert.IsTrue(ohm.Equals(null));
         }
 
+        [Test]
+        public void StaticConstructorWithNullAndEnumReturnsNull()
+        {
+            ElectricResistance? ohm = ElectricResistance.From(null,ElectricResistanceUnit.Ohm);
+            Assert.IsTrue(ohm.Equals(null));
+        }
+
+        [Test]
+        public void StaticConstructorWithNullAndEnumArgumentReturnsValueWhenInputArgumentHasValue()
+        {
+            double? value = 1.0;
+            ElectricResistance? ohm = ElectricResistance.From(value,ElectricResistanceUnit.Ohm);
+            Assert.IsTrue(ohm.HasValue);
+        }
+
         [Test]
         public void StaticConstructorWithNullArgumentReturnsValueWhenInputArgumentHasValue()
         {