Remove Newtonsoft.Json.Linq usage from unit tests

riganti · Apr 24, 2024 · 1dc58d7 · 1dc58d7
1 parent 6e485b2
commit 1dc58d7
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 37 deletions.
diff --git a/src/Api/Swashbuckle.AspNetCore.Tests/SwaggerFileGenerationTests.cs b/src/Api/Swashbuckle.AspNetCore.Tests/SwaggerFileGenerationTests.cs
@@ -17,7 +17,6 @@
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 

diff --git a/src/Api/Swashbuckle.AspNetCore/Filters/AddTypeToModelSchemaFilter.cs b/src/Api/Swashbuckle.AspNetCore/Filters/AddTypeToModelSchemaFilter.cs
@@ -8,7 +8,6 @@
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
-using Newtonsoft.Json;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 

diff --git a/src/Framework/Framework/Binding/Expressions/BindingDebugJsonConverter.cs b/src/Framework/Framework/Binding/Expressions/BindingDebugJsonConverter.cs
@@ -2,28 +2,30 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using DotVVM.Framework.ResourceManagement;
 
 namespace DotVVM.Framework.Binding.Expressions
 {
-    internal class BindingDebugJsonConverter: JsonConverter<IBinding>
-    {
-        public override IBinding Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
-            throw new NotImplementedException("Deserializing dotvvm bindings from JSON is not supported.");
-        public override void Write(Utf8JsonWriter writer, IBinding obj, JsonSerializerOptions options)
+    internal class BindingDebugJsonConverter(bool detailed): GenericWriterJsonConverter<IBinding>((writer, obj, options) => {
+        if (detailed)
+        {
+            writer.WriteStartObject();
+            writer.WriteString("ToString"u8, obj.ToString());
+            var props = (obj as ICloneableBinding)?.GetAllComputedProperties() ?? Enumerable.Empty<IBinding>();
+            foreach (var p in props)
+            {
+                var name = p.GetType().Name;
+                writer.WritePropertyName(name);
+                JsonSerializer.Serialize(writer, p, options);
+            }
+            writer.WriteEndObject();
+        }
+        else
         {
             writer.WriteStringValue(obj?.ToString());
-
-            // w.WriteStartObject();
-            // w.WritePropertyName("ToString");
-            // w.WriteValue(obj.ToString());
-            // var props = (obj as ICloneableBinding)?.GetAllComputedProperties() ?? Enumerable.Empty<IBinding>();
-            // foreach (var p in props)
-            // {
-            //     var name = p.GetType().Name;
-            //     w.WritePropertyName(name);
-            //     serializer.Serialize(w, p);
-            // }
-            // w.WriteEndObject();
         }
+    })
+    {
+        public BindingDebugJsonConverter() : this(false) { }
     }
 }
diff --git a/src/Framework/Framework/Diagnostics/JsonSizeAnalyzer.cs b/src/Framework/Framework/Diagnostics/JsonSizeAnalyzer.cs
@@ -7,7 +7,6 @@
 using DotVVM.Framework.Utils;
 using DotVVM.Framework.ViewModel.Serialization;
 using FastExpressionCompiler;
-// using Newtonsoft.Json.Linq;
 
 namespace DotVVM.Framework.Diagnostics
 {

diff --git a/src/Samples/Api.Common/Model/Order.cs b/src/Samples/Api.Common/Model/Order.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace DotVVM.Samples.BasicSamples.Api.Common.Model
 {

diff --git a/src/Samples/Api.Common/Model/OrderItem.cs b/src/Samples/Api.Common/Model/OrderItem.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-
+
 namespace DotVVM.Samples.BasicSamples.Api.Common.Model
 {
     public class OrderItem

diff --git a/...Samples/Common/ViewModels/ControlSamples/GridView/NestedGridViewInlineEditingViewModel.cs b/...Samples/Common/ViewModels/ControlSamples/GridView/NestedGridViewInlineEditingViewModel.cs
@@ -6,7 +6,6 @@
 using DotVVM.Framework.Compilation.ControlTree;
 using DotVVM.Framework.Controls;
 using DotVVM.Framework.ViewModel;
-using Newtonsoft.Json;
 
 namespace DotVVM.Samples.BasicSamples.ViewModels.ControlSamples.GridView
 {

diff --git a/src/Samples/Common/ViewModels/ControlSamples/GridView/RenamedPrimaryKeyViewModel.cs b/src/Samples/Common/ViewModels/ControlSamples/GridView/RenamedPrimaryKeyViewModel.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using DotVVM.Framework.Controls;
-using Newtonsoft.Json;
 
 namespace DotVVM.Samples.BasicSamples.ViewModels.ControlSamples.GridView
 {

diff --git a/src/Tests/Binding/StaticCommandExecutorTests.cs b/src/Tests/Binding/StaticCommandExecutorTests.cs
@@ -14,7 +14,6 @@
 using DotVVM.Framework.ViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json.Linq;
 using static DotVVM.Framework.Testing.DotvvmTestHelper;
 
 namespace DotVVM.Framework.Tests.Binding

diff --git a/src/Tests/ControlTests/CommandTests.cs b/src/Tests/ControlTests/CommandTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using DotVVM.Framework.Testing;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Microsoft.Extensions.DependencyInjection;
 using DotVVM.Framework.ViewModel;
 

diff --git a/src/Tests/Runtime/ConfigurationSerializationTests.cs b/src/Tests/Runtime/ConfigurationSerializationTests.cs
@@ -11,8 +11,10 @@
 using DotVVM.Framework.ResourceManagement;
 using DotVVM.Framework.Testing;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Encodings.Web;
 
 namespace DotVVM.Framework.Tests.Runtime
 {
@@ -43,19 +45,19 @@ void checkConfig(DotvvmConfiguration config, bool includeProperties = false, str
 
             Console.WriteLine(serialized);
 
-            var jobject = JObject.Parse(serialized);
-            void removeTestStuff(JToken token)
+            var jobject = JsonNode.Parse(serialized).AsObject();
+            void removeTestStuff(JsonNode token)
             {
-                if (token is JObject obj)
-                    foreach (var testControl in obj.Properties().Where(p => p.Name.Contains(".Tests.")).ToArray())
-                        testControl.Remove();
+                if (token is JsonObject obj)
+                    foreach (var testControl in obj.Where(p => p.Key.Contains(".Tests.")).ToArray())
+                        obj.Remove(testControl.Key);
             }
             removeTestStuff(jobject["properties"]);
             removeTestStuff(jobject["propertyGroups"]);
             removeTestStuff(jobject["capabilities"]);
             removeTestStuff(jobject["controls"]);
-            jobject["assemblies"]?.Parent.Remove(); // there are user specific paths
-            check.CheckString(jobject.ToString(), checkName, fileExtension, memberName, sourceFilePath);
+            jobject.Remove("assemblies"); // there are user specific paths
+            check.CheckString(jobject.ToJsonString(new JsonSerializerOptions { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, WriteIndented = true }), checkName, fileExtension, memberName, sourceFilePath);
         }
 
         [TestMethod]

diff --git a/src/Tests/Runtime/ControlTree/ServerSideStyleTests.cs b/src/Tests/Runtime/ControlTree/ServerSideStyleTests.cs
@@ -18,7 +18,6 @@
 using DotVVM.Framework.ResourceManagement;
 using DotVVM.Framework.ViewModel;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json.Linq;
 
 namespace DotVVM.Framework.Tests.Runtime.ControlTree
 {

diff --git a/src/Tests/Runtime/RuntimeErrorTests.cs b/src/Tests/Runtime/RuntimeErrorTests.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
 using DotVVM.Framework.Configuration;
 using DotVVM.Framework.Hosting;
 using DotVVM.Framework.ResourceManagement;