remove newtonsoft dependency from core library (it serializes out of …

…the box), add pending System.Text.Json tests
CSBiology · Sep 25, 2024 · fb334d3 · fb334d3
1 parent 27e0ac4
commit fb334d3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/src/DynamicObj.Immutable/DynamicObj.Immutable.fsproj b/src/DynamicObj.Immutable/DynamicObj.Immutable.fsproj
@@ -30,6 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Fable.Core" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DynamicObj/DynamicObj.fs b/src/DynamicObj/DynamicObj.fs
@@ -2,11 +2,6 @@
 
 #if !FABLE_COMPILER
 open System.Dynamic
-open Newtonsoft.Json
-open Newtonsoft.Json.Serialization
-open Newtonsoft.Json.Converters
-open Newtonsoft.Json.Linq
-open System.Runtime.Serialization
 #endif
 
 open System.Collections.Generic

diff --git a/src/DynamicObj/DynamicObj.fsproj b/src/DynamicObj/DynamicObj.fsproj
@@ -38,7 +38,6 @@
 
   <ItemGroup>
     <PackageReference Include="Fable.Core" Version="4.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/DynamicObject.Tests/DynamicObject.Tests.fsproj b/tests/DynamicObject.Tests/DynamicObject.Tests.fsproj
@@ -32,6 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <ProjectReference Include="..\..\src\DynamicObj\DynamicObj.fsproj" />
   </ItemGroup>
 

diff --git a/tests/DynamicObject.Tests/Serialization.fs b/tests/DynamicObject.Tests/Serialization.fs
@@ -5,10 +5,6 @@ open System.Collections.Generic
 open Fable.Pyxpecto
 open DynamicObj
 
-#if !FABLE_COMPILER
-open Newtonsoft.Json
-#endif
-
 open DynamicObj
 
 let test_dynobj = 
@@ -71,15 +67,29 @@ let test_derived_2 =
 #if !FABLE_COMPILER
 let tests_newtonsoft = testList "Newtonsoft (.NET)" [
     testCase "Serialize DynamicObj" <| fun _ ->
-        let actual = JsonConvert.SerializeObject(test_dynobj)
+        let actual = Newtonsoft.Json.JsonConvert.SerializeObject(test_dynobj)
+        Expect.equal actual """{"dynamic_string":"yes","dynamic_number":69,"dynamic_boolean":true,"dynamic_array":["First","Second"],"dynamic_object":{"inner":"yup"}}""" ""
+
+    testCase "Serialize simplederived class from DynamicObj" <| fun _ ->
+        let actual = Newtonsoft.Json.JsonConvert.SerializeObject(test_derived_1)
+        Expect.equal actual """{"StaticProp":"lol","dynamicProp":42}""" ""
+
+    testCase "Serialize complex derived class from DynamicObj" <| fun _ ->
+        let actual = Newtonsoft.Json.JsonConvert.SerializeObject(test_derived_2)
+        Expect.equal actual """{"StaticString":"lol","StaticNumber":42.0,"StaticBoolean":true,"StaticArray":["First","Second"],"StaticObject":{"StaticProp":"lol","dynamicProp":42},"dynamic_string":"yes","dynamic_number":69,"dynamic_boolean":true,"dynamic_array":["First","Second"],"dynamic_object":{"inner":"yup"}}""" ""
+]
+
+let tests_system_text_json = ptestList "System.Text.Json (.NET)" [
+    testCase "Serialize DynamicObj" <| fun _ ->
+        let actual = System.Text.Json.JsonSerializer.Serialize(test_dynobj)
         Expect.equal actual """{"dynamic_string":"yes","dynamic_number":69,"dynamic_boolean":true,"dynamic_array":["First","Second"],"dynamic_object":{"inner":"yup"}}""" ""
 
     testCase "Serialize simplederived class from DynamicObj" <| fun _ ->
-        let actual = JsonConvert.SerializeObject(test_derived_1)
+        let actual = System.Text.Json.JsonSerializer.Serialize(test_derived_1)
         Expect.equal actual """{"StaticProp":"lol","dynamicProp":42}""" ""
 
     testCase "Serialize complex derived class from DynamicObj" <| fun _ ->
-        let actual = JsonConvert.SerializeObject(test_derived_2)
+        let actual = System.Text.Json.JsonSerializer.Serialize(test_derived_2)
         Expect.equal actual """{"StaticString":"lol","StaticNumber":42.0,"StaticBoolean":true,"StaticArray":["First","Second"],"StaticObject":{"StaticProp":"lol","dynamicProp":42},"dynamic_string":"yes","dynamic_number":69,"dynamic_boolean":true,"dynamic_array":["First","Second"],"dynamic_object":{"inner":"yup"}}""" ""
 ]
 #endif
@@ -91,5 +101,6 @@ let main = testList "Serialization" [
     tests_custom
     #if !FABLE_COMPILER
     tests_newtonsoft
+    tests_system_text_json
     #endif
 ]