Make all JSON strings valid in tests

So that we can get rid of the `ToValidJson` extension method.

Now that raw string literals have been introduced (in serilog#354) having valid _readable_ JSON in strings for tests becomes easy. There is no need to escape quotes anymore with either `\"` or `""`.

This will also make it easier for newcomers to understand the tests at first glance. I had my WTF moment when I first saw JSON with single quotes. 🤔

Author: 0xced

test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs

@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Reflection;
 using Microsoft.Extensions.Configuration;
 using Serilog.Events;
@@ -16,7 +15,7 @@ public class ConfigurationReaderTests
     public ConfigurationReaderTests()
     {
         _configurationReader = new ConfigurationReader(
-            JsonStringConfigSource.LoadSection("{ 'Serilog': {  } }", "Serilog"),
+            JsonStringConfigSource.LoadSection("{ \"Serilog\": {  } }", "Serilog"),
             AssemblyFinder.ForSource(ConfigurationAssemblySource.UseLoadedAssemblies),
             new ConfigurationReaderOptions());
     }
@@ -26,7 +25,7 @@ public void WriteToSupportSimplifiedSyntax()
     {
         var json = """
         {
-            'WriteTo': [ 'LiterateConsole', 'DiagnosticTrace' ]
+            "WriteTo": [ "LiterateConsole", "DiagnosticTrace" ]
         }
         """;
 
@@ -44,8 +43,8 @@ public void WriteToSupportExpandedSyntaxWithoutArgs()
     {
         var json = """
         {
-            'WriteTo': [ {
-                'Name': 'LiterateConsole'
+            "WriteTo": [ {
+                "Name": "LiterateConsole"
             }]
         }
         """;
@@ -62,10 +61,10 @@ public void WriteToSupportExpandedSyntaxWithArgs()
     {
         var json = """
         {
-            'WriteTo': [ {
-                'Name': 'LiterateConsole',
-                'Args': {
-                    'outputTemplate': '{Message}'
+            "WriteTo": [ {
+                "Name": "LiterateConsole",
+                "Args": {
+                    "outputTemplate": "{Message}"
                 },
             }]
         }
@@ -90,25 +89,25 @@ public void WriteToSupportMultipleSinksOfTheSameKind()
     {
         var json = """
         {
-            'WriteTo': [
+            "WriteTo": [
               {
-                'Name': 'LiterateConsole',
-                'Args': {
-                    'outputTemplate': '{Message}'
+                "Name": "LiterateConsole",
+                "Args": {
+                    "outputTemplate": "{Message}"
                   },
               },
-              'DiagnosticTrace'
+              "DiagnosticTrace"
             ],
-            'WriteTo:File1': {
-                'Name': 'File',
-                'Args': {
-                    'outputTemplate': '{Message}'
+            "WriteTo:File1": {
+                "Name": "File",
+                "Args": {
+                    "outputTemplate": "{Message}"
                 },
             },
-            'WriteTo:File2': {
-                'Name': 'File',
-                'Args': {
-                    'outputTemplate': '{Message}'
+            "WriteTo:File2": {
+                "Name": "File",
+                "Args": {
+                    "outputTemplate": "{Message}"
                 },
             }
         }
@@ -131,7 +130,7 @@ public void Enrich_SupportSimplifiedSyntax()
     {
         var json = """
         {
-            'Enrich': [ 'FromLogContext', 'WithMachineName', 'WithThreadId' ]
+            "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
         }
         """;
 
@@ -274,7 +273,17 @@ public void MixedMinimumLevelCorrectOneIsEnabledOnLogger(IConfigurationRoot root
     [Fact]
     public void NoConfigurationRootUsedStillValid()
     {
-        var section = JsonStringConfigSource.LoadSection("{ 'Nest': { 'Serilog': { 'MinimumLevel': 'Error' } } }", "Nest");
+        var json = """
+        {
+            "Nest": {
+                "Serilog": {
+                    "MinimumLevel": "Error"
+                }
+            }
+        }
+        """;
+
+        var section = JsonStringConfigSource.LoadSection(json, "Nest");
         var reader = new ConfigurationReader(section.GetSection("Serilog"), AssemblyFinder.ForSource(ConfigurationAssemblySource.UseLoadedAssemblies), new ConfigurationReaderOptions(), section);
         var loggerConfig = new LoggerConfiguration();
 

test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs

@@ -395,12 +395,12 @@ public void LoggingFilterSwitchIsConfigured(string switchName)
     {
         var json = $$"""
             {
-                'Serilog': {
-                    'FilterSwitches': { '{{switchName}}': 'Prop = 42' },
-                    'Filter:BySwitch': {
-                        'Name': 'ControlledBy',
-                        'Args': {
-                            'switch': '$mySwitch'
+                "Serilog": {
+                    "FilterSwitches": { "{{switchName}}": "Prop = 42" },
+                    "Filter:BySwitch": {
+                        "Name": "ControlledBy",
+                        "Args": {
+                            "switch": "$mySwitch"
                         }
                     }
                 }
@@ -426,10 +426,10 @@ public void LoggingLevelSwitchIsConfigured(string switchName)
     {
         var json = $$"""
             {
-                'Serilog': {
-                    'LevelSwitches': { '{{switchName}}' : 'Warning' },
-                    'MinimumLevel' : {
-                        'ControlledBy' : '$switch1'
+                "Serilog": {
+                    "LevelSwitches": { "{{switchName}}" : "Warning" },
+                    "MinimumLevel" : {
+                        "ControlledBy" : "$switch1"
                     }
                 }
             }
@@ -1379,12 +1379,12 @@ public void TestLogLevelSwitchesCallback(string switchName)
     {
         var json = $$"""
             {
-                'Serilog': {
-                    'LevelSwitches': { '{{switchName}}': 'Information' },
-                    'MinimumLevel': {
-                        'Override': {
-                            'System': 'Warning',
-                            'System.Threading': 'Debug'
+                "Serilog": {
+                    "LevelSwitches": { "{{switchName}}": "Information" },
+                    "MinimumLevel": {
+                        "Override": {
+                            "System": "Warning",
+                            "System.Threading": "Debug"
                         }
                     }
                 }

test/Serilog.Settings.Configuration.Tests/DynamicLevelChangeTests.cs

@@ -11,26 +11,26 @@ public class DynamicLevelChangeTests
 {
     const string DefaultConfig = """
         {
-            'Serilog': {
-                'Using': [ 'TestDummies' ],
-                'MinimumLevel': {
-                    'Default': 'Information',
-                    'Override': {
-                        'Root.Test': 'Information'
+            "Serilog": {
+                "Using": [ "TestDummies" ],
+                "MinimumLevel": {
+                    "Default": "Information",
+                    "Override": {
+                        "Root.Test": "Information"
                     }
                 },
-                'LevelSwitches': { '$mySwitch': 'Information' },
-                'FilterSwitches': { '$myFilter': null },
-                'Filter:Dummy': {
-                    'Name': 'ControlledBy',
-                    'Args': {
-                        'switch': '$myFilter'
+                "LevelSwitches": { "$mySwitch": "Information" },
+                "FilterSwitches": { "$myFilter": null },
+                "Filter:Dummy": {
+                    "Name": "ControlledBy",
+                    "Args": {
+                        "switch": "$myFilter"
                     }
                 },
-                'WriteTo:Dummy': {
-                    'Name': 'DummyConsole',
-                    'Args': {
-                        'levelSwitch': '$mySwitch'
+                "WriteTo:Dummy": {
+                    "Name": "DummyConsole",
+                    "Args": {
+                        "levelSwitch": "$mySwitch"
                     }
                 }
             }

test/Serilog.Settings.Configuration.Tests/Support/ConfigurationReaderTestHelpers.cs

@@ -7,16 +7,16 @@ static class ConfigurationReaderTestHelpers
 {
     public const string minimumLevelFlatTemplate = """
     {{
-        'Serilog': {{
-            'MinimumLevel': '{0}'
+        "Serilog": {{
+            "MinimumLevel": "{0}"
         }}
     }}
     """;
     public const string minimumLevelObjectTemplate = """
     {{
-        'Serilog': {{
-            'MinimumLevel': {{
-                'Default': '{0}'
+        "Serilog": {{
+            "MinimumLevel": {{
+                "Default": "{0}"
             }}
         }}
     }}

test/Serilog.Settings.Configuration.Tests/Support/Extensions.cs

@@ -9,11 +9,5 @@ public static object LiteralValue(this LogEventPropertyValue @this)
         return ((ScalarValue)@this).Value;
     }
 
-    public static string ToValidJson(this string str)
-    {
-        str = str.Replace('\'', '"');
-        return str;
-    }
-
     public static string Format(this string template, params object[] paramObjects) => string.Format(template, paramObjects);
 }

test/Serilog.Settings.Configuration.Tests/Support/JsonStringConfigSource.cs

@@ -42,7 +42,7 @@ public JsonStringConfigProvider(string json) : base(new JsonConfigurationSource
 
         public override void Load()
         {
-            Load(StringToStream(_json.ToValidJson()));
+            Load(StringToStream(_json));
         }
 
         static Stream StringToStream(string str)