Fix DoubleToObjectConverter with GreaterThan and LessThan set

Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs

@@ -119,16 +119,18 @@ public object Convert(object value, Type targetType, object parameter, string la
 
             var boolValue = false;
 
-            if (GreaterThan != double.NaN && LessThan != double.NaN &&
-                vd > GreaterThan && vd < LessThan)
+            if (!double.IsNaN(GreaterThan) && !double.IsNaN(LessThan))
             {
-                boolValue = true;
+                if (vd > GreaterThan && vd < LessThan)
+                {
+                    boolValue = true;
+                }
             }
-            else if (GreaterThan != double.NaN && vd > GreaterThan)
+            else if (!double.IsNaN(GreaterThan) && vd > GreaterThan)
             {
                 boolValue = true;
             }
-            else if (LessThan != double.NaN && vd < LessThan)
+            else if (!double.IsNaN(LessThan) && vd < LessThan)
             {
                 boolValue = true;
             }

UnitTests/UnitTests.UWP/Converters/Test_DoubleToObjectConverter.cs

@@ -0,0 +1,116 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Toolkit.Uwp.UI.Converters;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using Windows.UI.Xaml;
+
+namespace UnitTests.Converters
+{
+    [TestClass]
+    public class Test_DoubleToObjectConverter
+    {
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_LessThan_Visible()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                LessThan = 1.0,
+            };
+            var result = converter.Convert(0.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Visible, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_LessThan_Collapsed()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                LessThan = 1.0,
+            };
+            var result = converter.Convert(1.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_GreaterThan_Visible()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                GreaterThan = 1.0,
+            };
+            var result = converter.Convert(1.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Visible, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_GreaterThan_Collapsed()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                GreaterThan = 1.0,
+            };
+            var result = converter.Convert(0.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_GreaterLessThan_Visible()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                GreaterThan = 1.0,
+                LessThan = 2.0,
+            };
+            var result = converter.Convert(1.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Visible, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_GreaterLessThan_ValueGreater_Collapsed()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                GreaterThan = 1.0,
+                LessThan = 2.0,
+            };
+            var result = converter.Convert(2.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_DoubleToVisibilityConverter_GreaterLessThan_ValueLess_Collapsed()
+        {
+            var converter = new DoubleToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                GreaterThan = 1.0,
+                LessThan = 2.0,
+            };
+            var result = converter.Convert(0.5, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+    }
+}

UnitTests/UnitTests.UWP/UnitTests.UWP.csproj

@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -164,6 +164,7 @@
     </Compile>
     <Compile Include="Behaviors\Test_AutoSelectBehavior.cs" />
     <Compile Include="Converters\Test_AdaptiveHeightValueConverter.cs" />
+    <Compile Include="Converters\Test_DoubleToObjectConverter.cs" />
     <Compile Include="Converters\Test_TaskResultConverter.cs" />
     <Compile Include="Converters\Test_BoolToObjectConverter.cs" />
     <Compile Include="Converters\Test_EmptyCollectionToObjectConverter.cs" />