Replace Newtonsoft.Json with System.Text.Json in tests and samples #4323
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using System.Text.Json.Nodes; | ||
|
|
||
| namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest | ||
| { | ||
| internal static class JsonTestHelper | ||
| { | ||
| // Test data is Array → Object → Value (3 levels). Use 64 as a safe ceiling. | ||
| private const int MaxDepth = 64; | ||
|
|
||
| /// <summary> | ||
| /// Performs a deep structural comparison of two <see cref="JsonElement"/> values. | ||
| /// On .NET 9+ this delegates to <see cref="JsonNode.DeepEquals"/>; on earlier | ||
| /// runtimes it uses a recursive comparison over the element trees. | ||
| /// </summary> | ||
| internal static bool JsonDeepEquals(JsonElement a, JsonElement b) | ||
| { | ||
| #if NET9_0_OR_GREATER | ||
| return JsonNode.DeepEquals( | ||
| JsonNode.Parse(a.GetRawText()), | ||
| JsonNode.Parse(b.GetRawText())); | ||
| #else | ||
| return DeepEqualsCore(a, b, depth: 0); | ||
| #endif | ||
| } | ||
|
|
||
| private static bool DeepEqualsCore(JsonElement a, JsonElement b, int depth) | ||
| { | ||
| if (depth > MaxDepth) | ||
| { | ||
| throw new InvalidOperationException($"JSON comparison exceeded maximum depth of {MaxDepth}."); | ||
| } | ||
|
|
||
| if (a.ValueKind != b.ValueKind) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| switch (a.ValueKind) | ||
| { | ||
| case JsonValueKind.Object: | ||
| int countA = a.EnumerateObject().Count(); | ||
| int countB = b.EnumerateObject().Count(); | ||
| if (countA != countB) | ||
| { | ||
| return false; | ||
| } | ||
| foreach (JsonProperty prop in a.EnumerateObject()) | ||
| { | ||
| if (!b.TryGetProperty(prop.Name, out JsonElement bValue) || | ||
| !DeepEqualsCore(prop.Value, bValue, depth + 1)) | ||
| { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
|
|
||
| case JsonValueKind.Array: | ||
| JsonElement.ArrayEnumerator arrA = a.EnumerateArray(); | ||
| JsonElement.ArrayEnumerator arrB = b.EnumerateArray(); | ||
| while (arrA.MoveNext()) | ||
| { | ||
| if (!arrB.MoveNext() || !DeepEqualsCore(arrA.Current, arrB.Current, depth + 1)) | ||
| { | ||
| return false; | ||
| } | ||
| } | ||
| return !arrB.MoveNext(); | ||
|
|
||
| case JsonValueKind.String: | ||
| return a.GetString() == b.GetString(); | ||
|
|
||
| default: | ||
| return a.GetRawText() == b.GetRawText(); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The old test was confirming that Newtonsoft round-tripping functioned, which isn't our responsibility. Now we're checking that specific fields from our SqlException can be serialized, which is still not really our responsibility, but is at least more targeted.