Respect json settings in ToObject (#693)

SimonCropp · web-flow · commit 93d04a7556d6 · 2022-11-01T16:46:59.000+11:00
diff --git a/docs/serializer-settings.md b/docs/serializer-settings.md
@@ -476,7 +476,7 @@ public Task ScopedSerializerFluent()
         .AddExtraSettings(_ => _.TypeNameHandling = TypeNameHandling.All);
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3207-L3234' title='Snippet source file'>snippet source</a> | <a href='#snippet-scopedserializer' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3223-L3250' title='Snippet source file'>snippet source</a> | <a href='#snippet-scopedserializer' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -967,7 +967,7 @@ public Task WithObsoleteProp()
     return Verify(target);
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3172-L3193' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoleteprop' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3188-L3209' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoleteprop' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -1015,7 +1015,7 @@ public Task WithObsoletePropIncludedFluent()
         .IncludeObsoletes();
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3143-L3170' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincluded' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3159-L3186' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincluded' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Or globally:
@@ -1025,7 +1025,7 @@ Or globally:
 ```cs
 VerifierSettings.IncludeObsoletes();
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3136-L3140' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincludedglobally' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3152-L3156' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincludedglobally' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -1421,7 +1421,7 @@ public Task CustomExceptionPropFluent()
         .IgnoreMembersThatThrow<CustomException>();
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3029-L3048' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrow' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3045-L3064' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrow' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Or globally:
@@ -1431,7 +1431,7 @@ Or globally:
 ```cs
 VerifierSettings.IgnoreMembersThatThrow<CustomException>();
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3022-L3026' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrowglobal' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L3038-L3042' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrowglobal' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
diff --git a/readme.md b/readme.md
@@ -354,7 +354,7 @@ public Task VerifyJsonJToken()
     return Verify(target);
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L2915-L2950' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyjson' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L2931-L2966' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyjson' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Results in:
diff --git a/src/StrictJsonTests/SerializationTests.VerifyJsonEmpty.verified.json b/src/StrictJsonTests/SerializationTests.VerifyJsonEmpty.verified.json
@@ -0,0 +1 @@
+﻿{}
diff --git a/src/StrictJsonTests/SerializationTests.VerifyJsonOnlyIgnoredMember.verified.json b/src/StrictJsonTests/SerializationTests.VerifyJsonOnlyIgnoredMember.verified.json
@@ -0,0 +1 @@
+﻿{}
diff --git a/src/StrictJsonTests/SerializationTests.VerifyJsonRefRespectSerializerSettings.verified.json b/src/StrictJsonTests/SerializationTests.VerifyJsonRefRespectSerializerSettings.verified.json
@@ -0,0 +1,3 @@
+﻿{
+  "$ref": "#/no/ref"
+}
diff --git a/src/StrictJsonTests/SerializationTests.VerifyJsonTypeRespectSerializerSettings.verified.json b/src/StrictJsonTests/SerializationTests.VerifyJsonTypeRespectSerializerSettings.verified.json
@@ -0,0 +1,3 @@
+﻿{
+  "$type": "MyNamespace.User, MyAssembly"
+}
diff --git a/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonEmpty.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonEmpty.verified.txt
@@ -0,0 +1 @@
+﻿{}
diff --git a/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonOnlyIgnoredMember.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonOnlyIgnoredMember.verified.txt
@@ -0,0 +1 @@
+﻿{}
diff --git a/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonRefRespectSerializerSettings.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonRefRespectSerializerSettings.verified.txt
@@ -0,0 +1,3 @@
+﻿{
+  $ref: #/no/ref
+}
diff --git a/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonTypeRespectSerializerSettings.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.VerifyJsonTypeRespectSerializerSettings.verified.txt
@@ -0,0 +1,3 @@
+﻿{
+  $type: MyNamespace.User, MyAssembly
+}
diff --git a/src/Verify.Tests/Serialization/SerializationTests.cs b/src/Verify.Tests/Serialization/SerializationTests.cs
@@ -2873,11 +2873,27 @@ public Task ScrubJTokenByName()
     }
 
     [Fact]
-    public Task VerifyJsonGuid()
-    {
-        var json = "{'key': 'c572ff75-e1a2-49bd-99b9-4550697946c3'}";
-        return VerifyJson(json);
-    }
+    public Task VerifyJsonGuid() =>
+        VerifyJson("{'key': 'c572ff75-e1a2-49bd-99b9-4550697946c3'}");
+
+    [Fact]
+    public Task VerifyJsonEmpty() =>
+        VerifyJson("{}");
+
+    [Fact]
+    public Task VerifyJsonRefRespectSerializerSettings() =>
+        VerifyJson("{'$ref': '#/no/ref'}")
+            .AddExtraSettings(s => s.MetadataPropertyHandling = MetadataPropertyHandling.Ignore);
+
+    [Fact]
+    public Task VerifyJsonTypeRespectSerializerSettings() =>
+        VerifyJson("{ '$type': 'MyNamespace.User, MyAssembly'}")
+            .AddExtraSettings(s => s.MetadataPropertyHandling = MetadataPropertyHandling.Ignore);
+
+    [Fact]
+    public Task VerifyJsonOnlyIgnoredMember() =>
+        VerifyJson("{'key': 'value'}")
+            .IgnoreMember("key");
 
     [Fact]
     public Task VerifyJsonDateTime()
diff --git a/src/Verify/Serialization/Converters/JArrayConverter.cs b/src/Verify/Serialization/Converters/JArrayConverter.cs
@@ -3,7 +3,7 @@
 {
     public override void Write(VerifyJsonWriter writer, JArray value)
     {
-        var list = value.ToObject<List<object>>()!;
+        var list = value.ToObject<List<object>>(writer.Serializer)!;
         writer.Serialize(list);
     }
 }
diff --git a/src/Verify/Serialization/Converters/JObjectConverter.cs b/src/Verify/Serialization/Converters/JObjectConverter.cs
@@ -4,7 +4,7 @@
     public override void Write(VerifyJsonWriter writer, JObject value)
     {
         var dictionary = value
-            .ToObject<OrderedDictionary>()!;
+            .ToObject<OrderedDictionary>(writer.Serializer)!;
         writer.Serialize(dictionary);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public Task VerifyJsonJToken()`
`354`	`354`	`return Verify(target);`
`355`	`355`	`}`
`356`	`356`	```
`357`		`-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L2915-L2950' title='Snippet source file'>snippet source</a> \| <a href='#snippet-verifyjson' title='Start of snippet'>anchor</a></sup>`
	`357`	`+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L2931-L2966' title='Snippet source file'>snippet source</a> \| <a href='#snippet-verifyjson' title='Start of snippet'>anchor</a></sup>`
`358`	`358`	`<!-- endSnippet -->`
`359`	`359`
`360`	`360`	`Results in:`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "$type": "MyNamespace.User, MyAssembly"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ $type: MyNamespace.User, MyAssembly`
	`3`	`+}`