diff --git a/.idea/.idea.yTools/.idea/projectSettingsUpdater.xml b/.idea/.idea.yTools/.idea/projectSettingsUpdater.xml index 86cc6c6..ef20cb0 100644 --- a/.idea/.idea.yTools/.idea/projectSettingsUpdater.xml +++ b/.idea/.idea.yTools/.idea/projectSettingsUpdater.xml @@ -1,6 +1,8 @@ + \ No newline at end of file diff --git a/yTools.ConsoleTryout/yTools.ConsoleApp.csproj b/yTools.ConsoleTryout/yTools.ConsoleApp.csproj index 93dab33..9b17cd2 100644 --- a/yTools.ConsoleTryout/yTools.ConsoleApp.csproj +++ b/yTools.ConsoleTryout/yTools.ConsoleApp.csproj @@ -5,7 +5,8 @@ enable enable 0.2.2 - net7.0;net8.0 + net7.0;net8.0;net9.0 + LatestMajor diff --git a/yTools.Tests/SerializationTests.cs b/yTools.Tests/SerializationTests.cs index dd2b52b..74956be 100644 --- a/yTools.Tests/SerializationTests.cs +++ b/yTools.Tests/SerializationTests.cs @@ -1,20 +1,29 @@ namespace yTools.Tests { [TestClass] - public class SerializationTests + public class SerializationTests { private readonly char _sep = General.PathSeparator; - + [TestCleanup] public void Cleanup() { - const string testDirectory = "yTools"; - - var fullDir = $"{Environment.GetFolderPath( - Environment.SpecialFolder.LocalApplicationData - )}{_sep}{testDirectory}"; - if (Directory.Exists(fullDir)) - Directory.Delete(fullDir, true); + try + { + const string testDirectory = "yTools"; + var fullDir = $"{Environment.GetFolderPath( + Environment.SpecialFolder.LocalApplicationData + )}{_sep}{testDirectory}"; + if (Directory.Exists(fullDir)) + Directory.Delete(fullDir, true); + + if (Directory.Exists("./test-serialization")) + Directory.Delete("./test-serialization", true); + } + catch + { + Console.WriteLine("Something went wrong when cleaning up."); + } } [TestMethod] @@ -24,14 +33,7 @@ public void CheckObjectsJsonSerialized() TestSerializationObject testObject2 = new("Good Morning.", -8485, -6498.948); JsonSerializer serializer = new(); - - var directory = $"yTools{_sep}Tests{_sep}Serialization"; - serializer.SetSerializationDirectoryInLocalAppData(directory); - - Assert.IsTrue(Directory.Exists( - $"{Environment.GetFolderPath( - Environment.SpecialFolder.LocalApplicationData - )}{_sep}{directory}")); + serializer.SetSerializationDirectory("./test-serialization"); bool serialized = serializer.SerializeInDefault("testObject1.json", testObject1, out Exception? exception, out _); if (!serialized && exception != null) throw exception; @@ -56,14 +58,7 @@ public void CheckObjectsXmlSerialized() TestSerializationObject testObject2 = new("Good Morning.", -8485, -6498.948); XmlSerializer serializer = new(); - - var directory = $"yTools{_sep}Tests{_sep}Serialization"; - serializer.SetSerializationDirectoryInLocalAppData(directory); - - Assert.IsTrue(Directory.Exists( - $"{Environment.GetFolderPath( - Environment.SpecialFolder.LocalApplicationData - )}{_sep}{directory}")); + serializer.SetSerializationDirectory("./test-serialization"); bool serialized = serializer.SerializeInDefault("testObject1.xml", testObject1, out Exception? exception, out _); if (!serialized && exception != null) throw exception; @@ -92,7 +87,7 @@ public void CheckSerializationDirCreated() jsonSerializer.Serialize(testObj, "json.json", $@"{baseDir}{_sep}json", out _, out _); Assert.IsTrue(Directory.Exists($"{baseDir}{_sep}json")); - + xmlSerializer.Serialize(testObj, "xml.xml", $@"{baseDir}{_sep}xml", out _, out _); Assert.IsTrue(Directory.Exists($"{baseDir}{_sep}xml")); } @@ -131,4 +126,4 @@ public void CheckSerializeException() Console.WriteLine($"Type of XML exception: {ex.GetType()}"); } } -} \ No newline at end of file +} diff --git a/yTools.Tests/yTools.Tests.csproj b/yTools.Tests/yTools.Tests.csproj index 9ef7f05..7037a0b 100644 --- a/yTools.Tests/yTools.Tests.csproj +++ b/yTools.Tests/yTools.Tests.csproj @@ -7,7 +7,8 @@ false true 0.2.2 - net7.0;net8.0 + net7.0;net8.0;net9.0 + LatestMajor