Fix invalid cast coverting bool to expected int

anthonylangsworth · anthonylangsworth · commit 2b63108745a4 · 2016-10-07T22:35:32.000+11:00
Add unit tests for TypeConverter for scalars (only). Add DotSettings.user
to .gitignore.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,5 @@ artifacts/*
 *.nuget.targets
 *.lock.json
 *.nuget.props
+*.DotSettings.user
 
diff --git a/src/CommandLine/Core/TypeConverter.cs b/src/CommandLine/Core/TypeConverter.cs
@@ -84,7 +84,7 @@ private static Result<object, Exception> ChangeTypeScalarImpl(string value, Type
                     return (value == null) ? empty() : withValue();
                 };
 
-                return value.IsBooleanString()
+                return value.IsBooleanString() && conversionType == typeof(bool)
                     ? value.ToBoolean() : conversionType.GetTypeInfo().IsEnum
                         ? value.ToEnum(conversionType, ignoreValueCase) : safeChangeType();
             };
diff --git a/tests/CommandLine.Tests/CommandLine.Tests.csproj b/tests/CommandLine.Tests/CommandLine.Tests.csproj
@@ -112,6 +112,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Unit\Core\TokenTests.cs" />
+    <Compile Include="Unit\Core\TypeConverterTests.cs" />
     <Compile Include="Unit\Infrastructure\FSharpOptionHelperTests.cs" />
     <Compile Include="Unit\Core\ReflectionExtensions.cs" />
     <Compile Include="Unit\ParserResultExtensionsTests.cs" />
diff --git a/tests/CommandLine.Tests/Unit/Core/TypeConverterTests.cs b/tests/CommandLine.Tests/Unit/Core/TypeConverterTests.cs
@@ -0,0 +1,67 @@
+﻿using System;
+using System.CodeDom;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommandLine.Core;
+using CSharpx;
+using FluentAssertions;
+using Xunit;
+
+namespace CommandLine.Tests.Unit.Core
+{
+    public class TypeConverterTests
+    {
+        [Theory]
+        [MemberData("ChangeType_scalars_source")]
+        public void ChangeType_scalars(string testValue, Type destinationType, CultureInfo culture, bool expectFail, object expectedResult)
+        {
+            Maybe<object> result = TypeConverter.ChangeType(new[] {testValue}, destinationType, true, culture, true);
+
+            if (expectFail)
+            {
+                result.MatchNothing().Should().BeTrue();
+            }
+            else
+            {
+                object matchedValue;
+
+                result.MatchJust(out matchedValue).Should().BeTrue();
+                Assert.Equal(matchedValue, expectedResult);
+            }
+        }
+
+        public static IEnumerable<object[]> ChangeType_scalars_source
+        {
+            get
+            {
+                yield return new object[] { "1", typeof (int), CultureInfo.InvariantCulture, false, 1};
+                yield return new object[] { "0", typeof (int), CultureInfo.InvariantCulture, false, 0 };
+                yield return new object[] { "-1", typeof (int), CultureInfo.InvariantCulture, false, -1 };
+                yield return new object[] { "1.0", typeof (int), CultureInfo.InvariantCulture, true, null };
+                yield return new object[] { "1.0", typeof(float), CultureInfo.InvariantCulture, false, 1.0f };
+                yield return new object[] { "0.0", typeof (float), CultureInfo.InvariantCulture, false, 0.0f};
+                yield return new object[] { "-1.0", typeof (float), CultureInfo.InvariantCulture, false, -1.0f};
+                yield return new object[] { "1.0", typeof(double), CultureInfo.InvariantCulture, false, 1.0 };
+                yield return new object[] { "0.0", typeof (double), CultureInfo.InvariantCulture, false, 0.0};
+                yield return new object[] { "-1.0", typeof(double), CultureInfo.InvariantCulture, false, -1.0 };
+                yield return new object[] { "1.0", typeof(decimal), CultureInfo.InvariantCulture, false, 1.0m };
+                yield return new object[] { "0.0", typeof(decimal), CultureInfo.InvariantCulture, false, 0.0m };
+                yield return new object[] { "-1.0", typeof(decimal), CultureInfo.InvariantCulture, false, -1.0m };
+                yield return new object[] { "-1.123456", typeof(decimal), CultureInfo.InvariantCulture, false, -1.123456m };
+                yield return new object[] { "true", typeof(bool), CultureInfo.InvariantCulture, false, true };
+                yield return new object[] { "false", typeof (bool), CultureInfo.InvariantCulture, false, false };
+                yield return new object[] { "", typeof(string), CultureInfo.InvariantCulture, false, "" };
+                yield return new object[] { "abcd", typeof(int), CultureInfo.InvariantCulture, true, "abcd" };
+                yield return new object[] { "abcd", typeof(string), CultureInfo.InvariantCulture, false, "abcd" };
+
+                // Failed before change
+                yield return new object[] { "false", typeof(int), CultureInfo.InvariantCulture, true, 0 };
+                yield return new object[] { "true", typeof(int), CultureInfo.InvariantCulture, true, 0 };
+            }
+        }
+    }
+}
