Update Tests

Citrinate · Feb 25, 2024 · 6791ae7 · 6791ae7
1 parent f7dfec8
commit 6791ae7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/FreePackages.Tests/Apps.cs b/FreePackages.Tests/Apps.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
+using ArchiSteamFarm.Helpers.Json;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
 using SteamKit2;
 
 namespace FreePackages.Tests;
@@ -15,13 +15,13 @@ public class Apps {
 	[TestInitialize]
 	public void InitializePackageFilter () {
 		PackageFilter = new PackageFilter(new BotCache(), new List<FilterConfig>());
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		PackageFilter.Country = "FOO";
 	}
 
 	[TestCleanup]
 	public void CleanupPackageFilter() {
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		PackageFilter.Country = "FOO";
 	}
 
@@ -51,7 +51,7 @@ public void CanDetectAvailableAppByState() {
 	[TestMethod]
 	public void CanDetectRedeemableAppWithAppRequirement() {
 		var app = new FilterableApp(KeyValue.LoadAsText("app_with_required_app.txt"));
-		var userData = JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json"));
+		var userData = File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>();
 		userData.OwnedApps.Add(1086940);
 		PackageFilter.UpdateUserData(userData);
 

diff --git a/FreePackages.Tests/Filters.cs b/FreePackages.Tests/Filters.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
+using ArchiSteamFarm.Helpers.Json;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
 using SteamKit2;
 
 namespace FreePackages.Tests;
@@ -15,13 +15,13 @@ public class Filters {
 	[TestInitialize]
 	public void InitializePackageFilter () {
 		PackageFilter = new PackageFilter(new BotCache(), new List<FilterConfig>());
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		Filter = new FilterConfig();
 	}
 
 	[TestCleanup]
 	public void CleanupPackageFilter() {
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		Filter = new FilterConfig();
 	}
 
@@ -308,15 +308,15 @@ public void CanFilterByStoreData() {
 
 		Assert.IsFalse(PackageFilter.IsAppIgnoredByFilter(app, Filter));
 
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_with_ignored_apps.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_ignored_apps.json").ToJsonObject<UserData>());
 
 		Assert.IsTrue(PackageFilter.IsAppIgnoredByFilter(app, Filter));
 
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_with_excluded_tags.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_excluded_tags.json").ToJsonObject<UserData>());
 
 		Assert.IsTrue(PackageFilter.IsAppIgnoredByFilter(app, Filter));
 
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_with_excluded_content_descriptors.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_excluded_content_descriptors.json").ToJsonObject<UserData>());
 
 		Assert.IsTrue(PackageFilter.IsAppIgnoredByFilter(app, Filter));
 	}
@@ -333,7 +333,7 @@ public void CanUseMultipleFilters() {
 		filterB.Types.Add("Game");
 
 		var packageFilter = new PackageFilter(new BotCache(), new List<FilterConfig>() { filterA, filterB });
-		packageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		packageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 
 		Assert.IsFalse(packageFilter.IsAppWantedByFilter(app, filterA));
 		Assert.IsTrue(packageFilter.IsAppIgnoredByFilter(app, filterA));

diff --git a/FreePackages.Tests/Packages.cs b/FreePackages.Tests/Packages.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
+using ArchiSteamFarm.Helpers.Json;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
 using SteamKit2;
 
 namespace FreePackages.Tests;
@@ -14,13 +14,13 @@ public class Packages {
 	[TestInitialize]
 	public void InitializePackageFilter () {
 		PackageFilter = new PackageFilter(new BotCache(), new List<FilterConfig>());
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		PackageFilter.Country = "FOO";
 	}
 
 	[TestCleanup]
 	public void CleanupPackageFilter() {
-		PackageFilter.UpdateUserData(JsonConvert.DeserializeObject<UserData>(File.ReadAllText("userdata_empty.json")));
+		PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject<UserData>());
 		PackageFilter.Country = "FOO";
 	}