From 6791ae751d95924265e95221b789c26d7da313cb Mon Sep 17 00:00:00 2001 From: Citrinate Date: Sat, 24 Feb 2024 20:07:36 -0500 Subject: [PATCH] Update Tests --- FreePackages.Tests/Apps.cs | 8 ++++---- FreePackages.Tests/Filters.cs | 14 +++++++------- FreePackages.Tests/Packages.cs | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/FreePackages.Tests/Apps.cs b/FreePackages.Tests/Apps.cs index 5fb20e9..a7d3a76 100644 --- 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()); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); PackageFilter.Country = "FOO"; } [TestCleanup] public void CleanupPackageFilter() { - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); 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(File.ReadAllText("userdata_empty.json")); + var userData = File.ReadAllText("userdata_empty.json").ToJsonObject(); userData.OwnedApps.Add(1086940); PackageFilter.UpdateUserData(userData); diff --git a/FreePackages.Tests/Filters.cs b/FreePackages.Tests/Filters.cs index 8cff176..b3dd87f 100644 --- 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()); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); Filter = new FilterConfig(); } [TestCleanup] public void CleanupPackageFilter() { - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); Filter = new FilterConfig(); } @@ -308,15 +308,15 @@ public void CanFilterByStoreData() { Assert.IsFalse(PackageFilter.IsAppIgnoredByFilter(app, Filter)); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_with_ignored_apps.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_ignored_apps.json").ToJsonObject()); Assert.IsTrue(PackageFilter.IsAppIgnoredByFilter(app, Filter)); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_with_excluded_tags.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_excluded_tags.json").ToJsonObject()); Assert.IsTrue(PackageFilter.IsAppIgnoredByFilter(app, Filter)); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_with_excluded_content_descriptors.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_with_excluded_content_descriptors.json").ToJsonObject()); 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() { filterA, filterB }); - packageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + packageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); Assert.IsFalse(packageFilter.IsAppWantedByFilter(app, filterA)); Assert.IsTrue(packageFilter.IsAppIgnoredByFilter(app, filterA)); diff --git a/FreePackages.Tests/Packages.cs b/FreePackages.Tests/Packages.cs index ba613ba..7e158d6 100644 --- 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()); - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); PackageFilter.Country = "FOO"; } [TestCleanup] public void CleanupPackageFilter() { - PackageFilter.UpdateUserData(JsonConvert.DeserializeObject(File.ReadAllText("userdata_empty.json"))); + PackageFilter.UpdateUserData(File.ReadAllText("userdata_empty.json").ToJsonObject()); PackageFilter.Country = "FOO"; }