cleanup

VerifyTests · Mar 10, 2025 · ca0db71 · ca0db71
1 parent 69bc719
commit ca0db71
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 32 deletions.
diff --git a/src/Verify/Serialization/SerializationSettings.cs b/src/Verify/Serialization/SerializationSettings.cs
@@ -144,6 +144,8 @@ public void AddExtraSettings(Action<JsonSerializerSettings> action)
     List<Action<JsonSerializerSettings>> extraSettings = [];
     JsonSerializer? serializer;
 
+    internal bool IgnoreNulls => Serializer.NullValueHandling.GetValueOrDefault(NullValueHandling.Ignore) == NullValueHandling.Ignore;
+
     internal JsonSerializer Serializer
     {
         get

diff --git a/src/Verify/Serialization/VerifyJsonWriter.cs b/src/Verify/Serialization/VerifyJsonWriter.cs
@@ -220,26 +220,7 @@ public void WriteMember(object target, object? value, string name)
     {
         if (value is null)
         {
-            if (serialization.TryGetScrubOrIgnoreByName(name, out var scrubOrIgnoreByName))
-            {
-                if (scrubOrIgnoreByName == ScrubOrIgnore.Ignore)
-                {
-                    return;
-                }
-
-                WritePropertyName(name);
-                WriteRawValueIfNoStrict("Scrubbed");
-
-                return;
-            }
-
-            if (serialization.Serializer.NullValueHandling.GetValueOrDefault(NullValueHandling.Ignore) == NullValueHandling.Ignore)
-            {
-                return;
-            }
-
-            WritePropertyName(name);
-            WriteNull();
+            WriteNullMember(name);
             return;
         }
 
@@ -281,36 +262,49 @@ public void WriteMember(object target, object? value, string name)
         var converter = VerifierSettings.GetMemberConverter(declaringType, name);
         if (converter is not null)
         {
-            var converted = converter(target, value);
-            if (converted is null)
+            value = converter(target, value);
+            if (value is null)
             {
                 return;
             }
-
-            WritePropertyName(name);
-            WriteOrSerialize(converted);
-
-            return;
         }
 
         WritePropertyName(name);
         WriteOrSerialize(value);
     }
 
+    void WriteNullMember(string name)
+    {
+        if (serialization.TryGetScrubOrIgnoreByName(name, out var scrubOrIgnoreByName))
+        {
+            if (scrubOrIgnoreByName != ScrubOrIgnore.Ignore)
+            {
+                WritePropertyName(name);
+                WriteRawValueIfNoStrict("Scrubbed");
+            }
+        }
+        else if (!serialization.IgnoreNulls)
+        {
+            WritePropertyName(name);
+            WriteNull();
+        }
+    }
+
     void WriteOrSerialize(object converted)
     {
         if (converted is string convertedString)
         {
             WriteValue(convertedString);
+            return;
         }
-        else if (converted.GetType().IsPrimitive)
+
+        if (converted.GetType().IsPrimitive)
         {
             WriteValue(converted);
+            return;
         }
-        else
-        {
-            settings.Serializer.Serialize(this, converted);
-        }
+
+        settings.Serializer.Serialize(this, converted);
     }
 
     /// <summary>