Fix for Issue #131

BindingTypeConverters EqualityTypeConverter.DoReferenceCast doesn't handle nullable values
reactiveui · Dec 5, 2012 · 56af287 · 56af287
1 parent 21d038c
commit 56af287
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/ReactiveUI.Tests/BindingTypeConvertersTest.cs b/ReactiveUI.Tests/BindingTypeConvertersTest.cs
@@ -0,0 +1,23 @@
+using Xunit;
+
+namespace ReactiveUI.Tests
+{
+    public class BindingTypeConvertersTest
+    {
+        [Fact]
+        public void EqualityTypeConverterDoReferenceCastShouldConvertNullableValues()
+        {
+            double? nullableDouble = 0.0;
+            var result = EqualityTypeConverter.DoReferenceCast<double?>(nullableDouble);
+            Assert.Equal(nullableDouble, result);
+        }
+
+        [Fact]
+        public void EqualityTypeConverterDoReferenceCastShouldConvertValueTypes()
+        {
+            double doubleValue = 0.0;
+            var result = EqualityTypeConverter.DoReferenceCast<double>(doubleValue);
+            Assert.Equal(doubleValue, result);
+        }
+    }
+}
diff --git a/ReactiveUI.Tests/ReactiveUI.Tests.csproj b/ReactiveUI.Tests/ReactiveUI.Tests.csproj
@@ -93,6 +93,7 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BindingTypeConvertersTest.cs" />
     <Compile Include="CommandBindingTests.cs" />
     <Compile Include="DependencyObjectObservableForPropertyTest.cs" />
     <Compile Include="ErrorsTest.cs" />
@@ -134,4 +135,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI/BindingTypeConverters.cs b/ReactiveUI/BindingTypeConverters.cs
@@ -42,16 +42,18 @@ public bool TryConvert(object from, Type toType, object conversionHint, out obje
 
         public static object DoReferenceCast<T>(object from)
         {
-#if WINRT
-            bool isValueType = typeof (T).GetTypeInfo().IsValueType;
-#else
-            bool isValueType = typeof (T).IsValueType;
-#endif
-            if (isValueType) {
-                return System.Convert.ChangeType(from, typeof (T), null);
-            } else {
-                return (T) from;
+            var t = typeof (T);
+            var u = Nullable.GetUnderlyingType(t);
+
+            if (u == null) {
+                return (T) Convert.ChangeType(from, t);
             }
+
+            if (from == null) {
+                return default(T);
+            }
+
+            return (T) Convert.ChangeType(from, u);
         }
     }