Skip to content

Commit 7f14a27

Browse files
committed
fix serialization tests not passing
1 parent 953ad48 commit 7f14a27

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/UniGetUI.Core.Settings.Tests/SettingsTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void TestListSettings(string SettingName, string[] ls1Array, int[] ls2Arr
173173
Assert.Equal("this is now a test case", Settings.GetListItem<string>(SettingName, 3));
174174
Assert.Null(Settings.GetListItem<string>(SettingName, 4));
175175

176-
Assert.Equal(Settings.GetListItem<string>(SettingName, 0), JsonSerializer.Deserialize<List<string>>(File.ReadAllText(Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{SettingName}.json")), CoreData.SerializingOptions)[0]);
176+
Assert.Equal(Settings.GetListItem<string>(SettingName, 0), JsonSerializer.Deserialize<List<string>>(File.ReadAllText(Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{SettingName}.json")), Settings.SerializationOptions)[0]);
177177
Settings.ClearList(SettingName);
178178
Assert.Empty(Settings.GetList<object>(SettingName) ?? ["this shouldn't be null; something's wrong"]);
179179

@@ -226,7 +226,7 @@ public void TestDictionarySettings(string SettingName, string[] keyArray, int[]
226226
Settings.SetDictionaryItem(randStr, "key", 12);
227227
Assert.Equal(12, Settings.GetDictionaryItem<string, int>(randStr, "key"));
228228
Settings.SetDictionary(SettingName, test);
229-
Assert.Equal(JsonSerializer.Serialize(test, CoreData.SerializingOptions), File.ReadAllText(Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{SettingName}.json")));
229+
Assert.Equal(JsonSerializer.Serialize(test, Settings.SerializationOptions), File.ReadAllText(Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{SettingName}.json")));
230230
Assert.Equal(test[keyArray[0]]?.sub.count, Settings.GetDictionary<string, SerializableTest?>(SettingName)?[keyArray[0]]?.sub.count);
231231
Assert.Equal(test[keyArray[1]]?.sub.count, Settings.GetDictionaryItem<string, SerializableTest?>(SettingName, keyArray[1])?.sub.count);
232232
Settings.SetDictionaryItem(SettingName, keyArray[0], test[keyArray[1]]);
@@ -257,7 +257,7 @@ public void TestDictionarySettings(string SettingName, string[] keyArray, int[]
257257
Assert.True(Settings.DictionaryContainsValue<string, SerializableTest?>(SettingName, test[keyArray[2]]));
258258

259259
Assert.Equal(
260-
JsonSerializer.Serialize(Settings.GetDictionary<string, SerializableTest>(SettingName), CoreData.SerializingOptions),
260+
JsonSerializer.Serialize(Settings.GetDictionary<string, SerializableTest>(SettingName), Settings.SerializationOptions),
261261
File.ReadAllText(Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{SettingName}.json"))
262262
);
263263

src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static void SetProxyCredentials(string username, string password)
8686
}
8787
}
8888

89-
private static JsonSerializerOptions SerializationOptions = new()
89+
public static JsonSerializerOptions SerializationOptions = new()
9090
{
9191
TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
9292
AllowTrailingCommas = true,

src/UniGetUI.Core.Tools.Tests/MetaTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ public void TestJsonSerializationOptions()
1717
var lines = File.ReadAllLines(file);
1818
var jsonSerCount = lines.Count(x => x.Contains("JsonSerializer.Serialize"));
1919
var jsonDeserCount = lines.Count(x => x.Contains("JsonSerializer.Deserialize"));
20-
var serialOptionsCount = lines.Count(x => x.Contains("CoreData.DefaultOptions"));
21-
Assert.True((jsonSerCount + jsonDeserCount) <= serialOptionsCount,
20+
var serialOptionsCount1 = lines.Count(x => x.Contains("SerializationHelpers.DefaultOptions"));
21+
var serialOptionsCount2 = lines.Count(x => x.Contains("SerializationHelpers.ImportBundleOptions"));
22+
var serialOptionsCount3 = lines.Count(x => x.Contains("SerializationOptions"));
23+
Assert.True((jsonSerCount + jsonDeserCount) <= serialOptionsCount1 + serialOptionsCount2 + serialOptionsCount3,
2224
$"Failing on {file}. The specified file does not serialize and/or deserialize JSON with" +
2325
$" the proper CoreData.DefaultOptions set");
2426
}

src/UniGetUI.Core.Tools/SerializationHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private static string xml_to_json(string XML)
2828
var doc = new XmlDocument();
2929
doc.LoadXml(XML);
3030
if (doc.DocumentElement is null) return "{'message': 'XmlDocument.DocumentElement was null'}";
31-
return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), DefaultOptions);
31+
return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), SerializationHelpers.DefaultOptions);
3232
}
3333

3434
private static object? _convertXmlNode(XmlNode node)

0 commit comments

Comments
 (0)