Add deeper tests for InstallOptions, fix bug

marticliment · marticliment · commit 901ef080147e · 2025-07-10T13:00:13.000+02:00
diff --git a/src/UniGetUI.PackageEngine.Serializable.Tests/TestInstallOptions.cs b/src/UniGetUI.PackageEngine.Serializable.Tests/TestInstallOptions.cs
@@ -1,4 +1,6 @@
 using System.Text.Json.Nodes;
+using WinRT.Interop;
+using Xunit.Sdk;
 
 namespace UniGetUI.PackageEngine.Serializable.Tests;
 
@@ -37,13 +39,13 @@ public void ToAndFromJsonNode(bool a, bool b, string c, string d, string e, stri
         var jsonContent = JsonNode.Parse(contents);
         Assert.NotNull(jsonContent);
         object2.LoadFromJson(jsonContent);
-        AreEqual(originalObject1, object2);
+        AssertAreEqual(originalObject1, object2);
 
         var object3 = new InstallOptions(originalObject1.AsJsonNode());
-        AreEqual(originalObject1, object3);
+        AssertAreEqual(originalObject1, object3);
 
         var object4 = originalObject1.Copy();
-        AreEqual(originalObject1, object4);
+        AssertAreEqual(originalObject1, object4);
     }
 
     [Theory]
@@ -99,19 +101,80 @@ public void FromJson(string JSON, bool hash, bool inter, string installLoc, stri
         Assert.Equal(ver, o2.Version);
     }
 
-    internal static void AreEqual(InstallOptions o1, InstallOptions o2)
+    [Theory]
+    [InlineData(13345)]
+    [InlineData(219574)]
+    [InlineData(-3453)]
+    [InlineData(15820753)]
+    [InlineData(9026)]
+    [InlineData(12783)]
+    [InlineData(87432574)]
+    [InlineData(34)]
+    [InlineData(86578312)]
+    public void RandomPropertyAssignTester(int seed)
     {
-        Assert.Equal(o1.SkipHashCheck, o2.SkipHashCheck);
-        Assert.Equal(o1.Architecture, o2.Architecture);
-        Assert.Equal(o1.CustomInstallLocation, o2.CustomInstallLocation);
-        Assert.Equal(o1.CustomParameters_Install.Where(x => x.Any()).ToList(), o2.CustomParameters_Install.Where(x => x.Any()).ToList());
-        Assert.Equal(o1.CustomParameters_Uninstall.Where(x => x.Any()).ToList(), o2.CustomParameters_Uninstall.Where(x => x.Any()).ToList());
-        Assert.Equal(o1.CustomParameters_Update.Where(x => x.Any()).ToList(), o2.CustomParameters_Update.Where(x => x.Any()).ToList());
-        Assert.Equal(o1.InstallationScope, o2.InstallationScope);
-        Assert.Equal(o1.InteractiveInstallation, o2.InteractiveInstallation);
-        Assert.Equal(o1.PreRelease, o2.PreRelease);
-        Assert.Equal(o1.RunAsAdministrator, o2.RunAsAdministrator);
-        Assert.Equal(o1.SkipMinorUpdates, o2.SkipMinorUpdates);
-        Assert.Equal(o1.Version, o2.Version);
+        InstallOptions o1 = GenerateRandom(seed);
+        InstallOptions o2 = o1.Copy();
+        Assert.True(o2.DiffersFromDefault());
+        AssertAreEqual(o1, o2);
+        var c1 = o1.AsJsonString();
+        var c2 = o2.AsJsonString();
+        Assert.Equal(c1, c2);
+        InstallOptions o3 = new();
+        o3.LoadFromJson(JsonNode.Parse(c1) ?? throw new ArgumentException("null"));
+        AssertAreEqual(o1, o2);
+        AssertAreEqual(o2, o3);
+        AssertAreEqual(o1, o3); // Yeah, it is redundant
+        Assert.Equal(c1, o3.AsJsonString());
+    }
+
+    private static InstallOptions GenerateRandom(int seed)
+    {
+        Random r = new(seed);
+
+        InstallOptions o1 = new();
+        foreach (var (key, _) in o1._defaultBoolValues)
+            o1.SetValueToProperty(key, r.Next(2) is 0);
+
+        o1.OverridesNextLevelOpts = r.Next(2) is 0;
+
+        foreach (var (key, _) in o1._defaultStringValues)
+            o1.SetValueToProperty(key, r.Next().ToString());
+
+        foreach (var key in o1._defaultListValues)
+        {
+            var randomList = Enumerable.Range(0, r.Next(0, 11))
+                .Select(_ => r.Next().ToString())
+                .ToList();
+            o1.SetValueToProperty(key, randomList);
+        }
+
+        return o1;
+    }
+
+    internal static void AssertAreEqual(InstallOptions o1, InstallOptions o2)
+    {
+        Assert.Equal(o1.OverridesNextLevelOpts, o2.OverridesNextLevelOpts);
+
+        foreach (var (key, _) in o1._defaultBoolValues)
+        {
+            Assert.Equal(
+                o1.GetValueFromProperty<bool>(key),
+                o2.GetValueFromProperty<bool>(key));
+        }
+
+        foreach (var (key, _) in o1._defaultStringValues)
+        {
+            Assert.Equal(
+                o1.GetValueFromProperty<string>(key),
+                o2.GetValueFromProperty<string>(key));
+        }
+
+        foreach (var key in o1._defaultListValues)
+        {
+            Assert.Equal(
+                o1.GetValueFromProperty<IReadOnlyList<string>>(key).Where(x => x.Any()),
+                o2.GetValueFromProperty<IReadOnlyList<string>>(key).Where(x => x.Any()));
+        }
     }
 }
diff --git a/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs b/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs
@@ -90,7 +90,7 @@ public void FromJson(string JSON, string id, string name, string version, string
         Assert.Equal(manager, o2.ManagerName);
         Assert.Equal(source, o2.Source);
         Assert.Equal(version, o2.Version);
-        TestInstallOptions.AreEqual(new() { SkipHashCheck = skipHash }, o2.InstallationOptions);
+        TestInstallOptions.AssertAreEqual(new() { SkipHashCheck = skipHash }, o2.InstallationOptions);
         TestSerializableUpdatesOptions.AreEqual(new(){IgnoredVersion = ignoredVer}, o2.Updates);
     }
 
@@ -101,7 +101,7 @@ internal static void AreEqual(SerializablePackage o1, SerializablePackage o2)
         Assert.Equal(o1.Source, o2.Source);
         Assert.Equal(o1.Version, o2.Version);
         Assert.Equal(o1.ManagerName, o2.ManagerName);
-        TestInstallOptions.AreEqual(o1.InstallationOptions, o2.InstallationOptions);
+        TestInstallOptions.AssertAreEqual(o1.InstallationOptions, o2.InstallationOptions);
         TestSerializableUpdatesOptions.AreEqual(o1.Updates, o2.Updates);
     }
 }
diff --git a/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs b/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs
@@ -6,7 +6,7 @@ namespace UniGetUI.PackageEngine.Serializable
 {
     public class InstallOptions: SerializableComponent<InstallOptions>
     {
-        private readonly IReadOnlyDictionary<string, bool> DefaultBoolValues = new Dictionary<string, bool>()
+        public readonly IReadOnlyDictionary<string, bool> _defaultBoolValues = new Dictionary<string, bool>()
         {   // OverridesNextLevelOpts is deliberately skipped here
             { "SkipHashCheck", false },
             { "InteractiveInstallation", false },
@@ -20,7 +20,7 @@ public class InstallOptions: SerializableComponent<InstallOptions>
             { "AbortOnPreUninstallFail", true },
         };
 
-        private readonly IReadOnlyDictionary<string, string> DefaultStringValues = new Dictionary<string, string>()
+        public readonly IReadOnlyDictionary<string, string> _defaultStringValues = new Dictionary<string, string>()
         {
             {"Architecture", ""},
             {"InstallationScope", ""},
@@ -34,7 +34,7 @@ public class InstallOptions: SerializableComponent<InstallOptions>
             {"PostUninstallCommand", ""},
         };
 
-        private readonly IReadOnlyList<string> DefaultListValues = new List<string>()
+        public readonly IReadOnlyList<string> _defaultListValues = new List<string>()
         {
             "CustomParameters_Install",
             "CustomParameters_Update",
@@ -75,13 +75,13 @@ public override InstallOptions Copy()
         {
             var copy = new InstallOptions();
 
-            foreach (var (boolKey, _) in DefaultBoolValues)
+            foreach (var (boolKey, _) in _defaultBoolValues)
                 copy.SetValueToProperty(boolKey, GetValueFromProperty<bool>(boolKey));
 
-            foreach (var (stringKey, _) in DefaultStringValues)
+            foreach (var (stringKey, _) in _defaultStringValues)
                 copy.SetValueToProperty(stringKey, GetValueFromProperty<string>(stringKey));
 
-            foreach (var listKey in DefaultListValues)
+            foreach (var listKey in _defaultListValues)
                 copy.SetValueToProperty(listKey, GetValueFromProperty<IReadOnlyList<string>>(listKey).ToList());
 
             // Handle non-automated OverridesNextLevelOpts
@@ -103,17 +103,13 @@ public T GetValueFromProperty<T>(string name)
 
         public override void LoadFromJson(JsonNode data)
         {
-            foreach (var (boolKey, defValue) in DefaultBoolValues)
-            {
-                // RemoveDataOnUninstall should not be loaded from disk
-                if(boolKey == "RemoveDataOnUninstall") continue;
+            foreach (var (boolKey, defValue) in _defaultBoolValues)
                 SetValueToProperty(boolKey, data[boolKey]?.GetVal<bool>() ?? defValue);
-            }
 
-            foreach (var (stringKey, defValue) in DefaultStringValues)
+            foreach (var (stringKey, defValue) in _defaultStringValues)
                 SetValueToProperty(stringKey, data[stringKey]?.GetVal<string>() ?? defValue);
 
-            foreach (var listKey in DefaultListValues)
+            foreach (var listKey in _defaultListValues)
                 SetValueToProperty(listKey, ReadArrayFromJson(data, listKey));
 
             // Handle case where setting has not been migrated yet
@@ -137,22 +133,22 @@ public override JsonNode AsJsonNode()
         {
             JsonObject obj = new();
 
-            if (OverridesNextLevelOpts is not false)
+            if (OverridesNextLevelOpts is not false || DiffersFromDefault())
                 obj.Add(nameof(OverridesNextLevelOpts), OverridesNextLevelOpts);
 
-            foreach (var (boolKey, defValue) in DefaultBoolValues)
+            foreach (var (boolKey, defValue) in _defaultBoolValues)
             {
                 bool currentValue = GetValueFromProperty<bool>(boolKey);
                 if (currentValue != defValue) obj.Add(boolKey, currentValue);
             }
 
-            foreach (var (stringKey, defValue) in DefaultStringValues)
+            foreach (var (stringKey, defValue) in _defaultStringValues)
             {
                 string currentValue = GetValueFromProperty<string>(stringKey);
                 if (currentValue != defValue) obj.Add(stringKey, currentValue);
             }
 
-            foreach (var listKey in DefaultListValues)
+            foreach (var listKey in _defaultListValues)
             {
                 IReadOnlyList<string> currentValue = GetValueFromProperty<IReadOnlyList<string>>(listKey);
 
@@ -176,13 +172,13 @@ private static List<string> ReadArrayFromJson(JsonNode data, string name)
 
         public bool DiffersFromDefault()
         {
-            foreach (var (boolKey, defValue) in DefaultBoolValues)
+            foreach (var (boolKey, defValue) in _defaultBoolValues)
                 if (GetValueFromProperty<bool>(boolKey) != defValue) return true;
 
-            foreach (var (stringKey, defValue) in DefaultStringValues)
+            foreach (var (stringKey, defValue) in _defaultStringValues)
                 if (GetValueFromProperty<string>(stringKey) != defValue) return true;
 
-            foreach (var listKey in DefaultListValues)
+            foreach (var listKey in _defaultListValues)
             {
                 IReadOnlyList<string> currentValue = GetValueFromProperty<IReadOnlyList<string>>(listKey);
                 if (currentValue.Where(x => x.Any()).Any()) return true;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public void FromJson(string JSON, string id, string name, string version, string`
`90`	`90`	`Assert.Equal(manager, o2.ManagerName);`
`91`	`91`	`Assert.Equal(source, o2.Source);`
`92`	`92`	`Assert.Equal(version, o2.Version);`
`93`		`- TestInstallOptions.AreEqual(new() { SkipHashCheck = skipHash }, o2.InstallationOptions);`
	`93`	`+ TestInstallOptions.AssertAreEqual(new() { SkipHashCheck = skipHash }, o2.InstallationOptions);`
`94`	`94`	`TestSerializableUpdatesOptions.AreEqual(new(){IgnoredVersion = ignoredVer}, o2.Updates);`
`95`	`95`	`}`
`96`	`96`
`@@ -101,7 +101,7 @@ internal static void AreEqual(SerializablePackage o1, SerializablePackage o2)`
`101`	`101`	`Assert.Equal(o1.Source, o2.Source);`
`102`	`102`	`Assert.Equal(o1.Version, o2.Version);`
`103`	`103`	`Assert.Equal(o1.ManagerName, o2.ManagerName);`
`104`		`- TestInstallOptions.AreEqual(o1.InstallationOptions, o2.InstallationOptions);`
	`104`	`+ TestInstallOptions.AssertAreEqual(o1.InstallationOptions, o2.InstallationOptions);`
`105`	`105`	`TestSerializableUpdatesOptions.AreEqual(o1.Updates, o2.Updates);`
`106`	`106`	`}`
`107`	`107`	`}`