Improved json diff generation, we do not move into arrays to sort object properties nested in there making diffs hard to read when objects in arrays are involved

(cherry picked from commit 9353c1a)

Author: Mpdreamz

src/Tests/Tests.Core/Extensions/DiffExtensions.cs

@@ -10,19 +10,28 @@ namespace Tests.Core.Extensions
 {
 	public static class DiffExtensions
 	{
-		public static void DeepSort(this JObject jObj)
+		public static void DeepSort(this JToken token)
 		{
-			if (jObj == null) return;
+			if (token == null) return;
 
-			var props = jObj.Properties().ToList();
-			foreach (var prop in props) prop.Remove();
+			if (token is JObject jObj)
+			{
+				var props = jObj.Properties().ToList();
+				foreach (var prop in props) prop.Remove();
 
-			foreach (var prop in props.OrderBy(p => p.Name))
+				foreach (var prop in props.OrderBy(p => p.Name))
+				{
+					jObj.Add(prop);
+					prop.Value?.DeepSort();
+				}
+			}
+			if (token is JArray jArray)
 			{
-				jObj.Add(prop);
-				var o = prop.Value as JObject;
-				o?.DeepSort();
+				foreach (var v in jArray.Values())
+					v?.DeepSort();
 			}
+			if (token is JProperty jProp)
+				jProp.Value?.DeepSort();
 		}
 
 		public static string CreateCharacterDifference(this string expected, string actual, string message = null)
@@ -59,7 +68,6 @@ private static string CreateDiff(string expected, string actual, string message,
 			var hasChanges = result.Lines.Any(l => l.Type != ChangeType.Unchanged);
 			if (!hasChanges) return string.Empty;
 
-
 			return result.Lines.Aggregate(new StringBuilder().AppendLine(message), (sb, line) =>
 			{
 				if (line.Type == ChangeType.Inserted)