Merge pull request #44 from myquay/patch-fix-value-convert-boolean

Fix issue with IConvertable and create unit test to detect regression…
myquay · Jun 22, 2023 · 17611a6 · 17611a6
2 parents 1eb648f + 4d3f379
commit 17611a6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/JsonPatch.Tests/CaseInsensitivePathHelperTests.cs b/src/JsonPatch.Tests/CaseInsensitivePathHelperTests.cs
@@ -6,6 +6,7 @@
 using JsonPatch;
 using JsonPatch.Paths;
 using System.Collections.Generic;
+using System.Text.Json;
 
 namespace JsonPatch.Tests
 {
@@ -431,6 +432,21 @@ public void SetValueFromPath_SimplePathAddValueToNull_UpdatesValue()
             Assert.AreEqual("New Value", entity.Foo);
         }
 
+        [TestMethod]
+        public void SetValueFromPath_NonConvertableToPrimative()
+        {
+            //arrange
+            var entity = new SimpleEntity { BooleanValue = false };
+
+            var document = JsonDocument.Parse("true");
+
+            //act
+            resolver.SetValueFromPath(typeof(SimpleEntity), "/booleanValue", entity, document.RootElement, JsonPatchOperationType.add);
+
+            //assert
+            Assert.AreEqual(true, entity.BooleanValue);
+        }
+
         [TestMethod]
         public void SetValueFromPath_SimplePathAddValueToNonNull_UpdatesValue()
         {

diff --git a/src/JsonPatch.Tests/Entitys/SimpleEntity.cs b/src/JsonPatch.Tests/Entitys/SimpleEntity.cs
@@ -19,5 +19,7 @@ public class SimpleEntity
 
         [JsonPropertyName("jsonProperty")]
         public string Car { get; set; }
+
+        public bool BooleanValue { get; set; }
     }
 }
diff --git a/src/JsonPatch/JsonValueConverter.cs b/src/JsonPatch/JsonValueConverter.cs
@@ -13,7 +13,7 @@ public class JsonValueConverter : IValueConverter
     {
         public object ConvertTo(object value, Type type)
         {
-            if(type.IsPrimitive)
+            if(type.IsPrimitive && value is IConvertible)
             {
                 return Convert.ChangeType(value, type, CultureInfo.InvariantCulture);
             }

diff --git a/src/JsonPatchCore/JsonValueConverter.cs b/src/JsonPatchCore/JsonValueConverter.cs
@@ -23,7 +23,7 @@ public class JsonValueConverter : IValueConverter
         public object ConvertTo(object value, Type type)
         {
 #pragma warning disable CS8604, CS8603 
-            if (type.IsPrimitive)
+            if (type.IsPrimitive && value is IConvertible)
             {
                 return Convert.ChangeType(value, type, CultureInfo.InvariantCulture);
             }