diff --git a/test/WireMock.Net.Tests/Transformers/JsonBodyTransformerTests.cs b/test/WireMock.Net.Tests/Transformers/JsonBodyTransformerTests.cs index 7bbca7a0..8c0e2530 100644 --- a/test/WireMock.Net.Tests/Transformers/JsonBodyTransformerTests.cs +++ b/test/WireMock.Net.Tests/Transformers/JsonBodyTransformerTests.cs @@ -19,18 +19,18 @@ public class JsonBodyTransformerTests { get { - return new TheoryData - { + return + [ new JsonBodyTransformerTestContext( () => new NewtonsoftJsonBodyTransformer(new WireMockServerSettings()), JObject.Parse, body => ((JToken)body).ToString(Formatting.None)), new JsonBodyTransformerTestContext( - () => new SystemTextJsonBodyTransformer(new WireMockServerSettings()), + () => new SystemTextJsonBodyTransformer(), json => JsonNode.Parse(json)!, body => ((JsonNode)body).ToJsonString()) - }; + ]; } } @@ -105,7 +105,7 @@ public class JsonBodyTransformerTests var transformerContext = new FakeTransformerContext( text => text, - text => text == "{{list}}" ? new WireMockList(new[] { "a", "b" }) : text); + text => text == "{{list}}" ? new WireMockList(["a", "b"]) : text); // Act var result = transformer.TransformBodyAsJson(transformerContext, ReplaceNodeOptions.EvaluateAndTryToConvert, new { }, bodyData); @@ -147,30 +147,18 @@ public class JsonBodyTransformerTests } } - private sealed class FakeTransformerContext : ITransformerContext + private sealed class FakeTransformerContext(Func parseAndRender, Func parseAndEvaluate) : ITransformerContext { - private readonly Func _parseAndRender; - private readonly Func _parseAndEvaluate; - - public FakeTransformerContext( - Func parseAndRender, - Func parseAndEvaluate) - { - _parseAndRender = parseAndRender; - _parseAndEvaluate = parseAndEvaluate; - FileSystemHandler = Mock.Of(); - } - - public IFileSystemHandler FileSystemHandler { get; private set; } + public IFileSystemHandler FileSystemHandler { get; private set; } = Mock.Of(); public string ParseAndRender(string text, object model) { - return _parseAndRender(text); + return parseAndRender(text); } public object ParseAndEvaluate(string text, object model) { - return _parseAndEvaluate(text); + return parseAndEvaluate(text); } } } \ No newline at end of file