Allow our DeserializeJsonResource method to accept customized setti…

…ngs.
MemphyKitay · Nov 20, 2022 · dabe46c · dabe46c
1 parent 1bbe49b
commit dabe46c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Tests/TestBase.cs b/Tests/TestBase.cs
@@ -2,6 +2,7 @@
 using EddiConfigService;
 using EddiCore;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.IO;
 
@@ -34,19 +35,22 @@ internal void MakeSafe()
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times")]
-        public static T DeserializeJsonResource<T>(byte[] data) where T : class
+        public static T DeserializeJsonResource<T>(byte[] data, JsonSerializerSettings settings = null) where T : class
         {
             using (var stream = new MemoryStream(data))
             {
                 using (var reader = new StreamReader(stream, System.Text.Encoding.UTF8))
                 {
+                    var jsonSerializer = settings is null 
+                        ? JsonSerializer.Create() 
+                        : JsonSerializer.Create(settings);
                     if (typeof(T) == typeof(string))
                     {
-                        return Newtonsoft.Json.JsonSerializer.Create().Deserialize(reader, typeof(JObject)).ToString() as T;
+                        return jsonSerializer.Deserialize(reader, typeof(JObject)).ToString() as T;
                     }
                     else
                     {
-                        return Newtonsoft.Json.JsonSerializer.Create().Deserialize(reader, typeof(T)) as T;
+                        return jsonSerializer.Deserialize(reader, typeof(T)) as T;
                     }
                 }
             }