Use newtonsoft.system.json

Author: ErikSchierboom

exercises/practice/acronym/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class AcronymTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.Equal({{expected}}, Acronym.Abbreviate({{input.phrase}}));
+        Assert.Equal({{literal expected}}, Acronym.Abbreviate({{literal input.phrase}}));
     }
     {{/test_cases}}
 }

exercises/practice/hamming/.meta/Generator.tpl

@@ -7,9 +7,9 @@ public class HammingTests
     public void {{method_name path}}()
     {
         {{#if error}}
-        Assert.Throws<ArgumentException>(() => Hamming.Distance({{input.strand1}}, {{input.strand2}}));
+        Assert.Throws<ArgumentException>(() => Hamming.Distance({{literal input.strand1}}, {{literal input.strand2}}));
         {{else}}
-        Assert.Equal({{expected}}, Hamming.Distance({{input.strand1}}, {{input.strand2}}));
+        Assert.Equal({{expected}}, Hamming.Distance({{literal input.strand1}}, {{literal input.strand2}}));
         {{/if}}
     }
     {{/test_cases}}

exercises/practice/isogram/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class IsogramTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.{{expected}}(Isogram.IsIsogram({{input.phrase}}));
+        Assert.{{expected}}(Isogram.IsIsogram({{literal input.phrase}}));
     }
     {{/test_cases}}
 }

exercises/practice/pangram/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class PangramTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.{{expected}}(Pangram.IsPangram({{input.sentence}}));
+        Assert.{{literal expected}}(Pangram.IsPangram({{literal input.sentence}}));
     }
     {{/test_cases}}
 }

exercises/practice/sieve/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class SieveTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.Equal({{expected}}, Sieve.Primes({{input.limit}}));
+        Assert.Equal([{{expected}}], Sieve.Primes({{input.limit}}));
     }
     {{/test_cases}}
 }

exercises/practice/space-age/.meta/Generator.tpl

@@ -7,7 +7,7 @@ public class SpaceAgeTests
     public void {{method_name path}}()
     {
         var sut = new SpaceAge({{input.seconds}});
-        Assert.Equal({{expected}}, sut.On{{raw input.planet}}(), precision: 2);
+        Assert.Equal({{expected}}, sut.On{{input.planet}}(), precision: 2);
     }
     {{/test_cases}}
 }

exercises/practice/sum-of-multiples/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class SumOfMultiplesTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.Equal({{expected}}, SumOfMultiples.Sum({{input.factors}}, {{input.limit}}));
+        Assert.Equal({{expected}}, SumOfMultiples.Sum([{{input.factors}}], {{input.limit}}));
     }
     {{/test_cases}}
 }

exercises/practice/two-fer/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class TwoFerTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{method_name path}}()
     {
-        Assert.Equal({{expected}}, TwoFer.Speak({{#if input.name}}{{input.name}}{{/if}}));
+        Assert.Equal({{literal expected}}, TwoFer.Speak({{#if input.name}}{{literal input.name}}{{/if}}));
     }
     {{/test_cases}}
 }

generators.new/CanonicalData.cs

@@ -1,9 +1,11 @@
 using System.Collections.Immutable;
-using System.Text.Json;
-using System.Text.Json.Nodes;
+using System.Dynamic;
 
 using LibGit2Sharp;
 
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
 namespace Generators;
 
 internal record TestCase(
@@ -17,41 +19,40 @@ internal record TestCase(
 
 internal static class CanonicalData
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new() { PropertyNameCaseInsensitive = true };
-
     static CanonicalData() => ProbSpecs.Sync();
 
     internal static TestCase[] Parse(Exercise exercise)
     {
         var json = File.ReadAllText(Paths.CanonicalDataFile(exercise));
-        var jsonNode = JsonNode.Parse(json)!.AsObject();
-        return Parse(jsonNode, ImmutableQueue<string>.Empty)
+        var jsonObject = JObject.Parse(json);
+        return Parse(jsonObject, ImmutableQueue<string>.Empty)
             .ToArray();
     }
 
-    private static IEnumerable<TestCase> Parse(JsonObject jsonObject, ImmutableQueue<string> path)
+    private static IEnumerable<TestCase> Parse(JObject jsonObject, ImmutableQueue<string> path)
     {
-        var updatedPath = jsonObject.TryGetPropertyValue("description", out var description)
-            ? path.Enqueue(description.Deserialize<string>()!)
+        var updatedPath = jsonObject.TryGetValue("description", out var description)
+            ? path.Enqueue(description.Value<string>()!)
             : path;
+
+        if (jsonObject.TryGetValue("cases", out var cases))
+            return ((JArray)cases).Cast<JObject>().SelectMany(child => Parse(child, updatedPath));
 
-        return jsonObject.TryGetPropertyValue("cases", out var cases)
-            ? cases!.AsArray().SelectMany(child => Parse(child!.AsObject(), updatedPath))
-            : [ToTestCase(jsonObject, updatedPath)];
+        return [ToTestCase(jsonObject, updatedPath)];
     }
 
-    private static TestCase ToTestCase(JsonObject testCaseJson, IEnumerable<string> path)
+    private static TestCase ToTestCase(JObject testCaseJson, IEnumerable<string> path)
     {
-        testCaseJson["path"] = JsonValue.Create(path);
+        testCaseJson["path"] = JArray.FromObject(path);
         testCaseJson["error"] = ToError(testCaseJson);
-        return testCaseJson.Deserialize<TestCase>(SerializerOptions)!;
+        return JsonConvert.DeserializeObject<TestCase>(testCaseJson.ToString())!;
     }
 
-    private static JsonNode? ToError(JsonObject testCaseJson)
+    private static JToken? ToError(JObject testCaseJson)
     {
-        if (testCaseJson["expected"] is JsonObject expectedJson &&
-            expectedJson.TryGetPropertyValue("error", out var error))
-            return error!.DeepClone();
+        if (testCaseJson["expected"] is JObject expectedJson &&
+            expectedJson.TryGetValue("error", out var error))
+            return error.DeepClone();
 
         return null;
     }

generators.new/Generators.new.csproj

@@ -10,10 +10,12 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Handlebars.Net" Version="2.1.6" />
+    <PackageReference Include="Handlebars.Net.Extension.NewtonsoftJson" Version="1.0.3" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.10" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Tomlyn" Version="0.18.0" />
   </ItemGroup>