Fix LocalizationManager Dispose

This has been a mare! I've put the dispose pattern in and also fixed how it cleans up cultures
Axemasta · Mar 4, 2025 · 5c38ea8 · 5c38ea8
1 parent e47c099
commit 5c38ea8
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/tests/Mocale.UnitTests/Managers/LocalizationManagerTests.cs b/tests/Mocale.UnitTests/Managers/LocalizationManagerTests.cs
@@ -11,7 +11,7 @@
 namespace Mocale.UnitTests.Managers;
 
 [Collection(CollectionNames.ThreadCultureTests)]
-public class LocalizationManagerTests : FixtureBase<ILocalizationManager>
+public class LocalizationManagerTests : FixtureBase<ILocalizationManager>, IDisposable
 {
     #region Setup
 
@@ -33,12 +33,24 @@ public LocalizationManagerTests()
 
     ~LocalizationManagerTests()
     {
-        Thread.CurrentThread.CurrentCulture = null!;
-        Thread.CurrentThread.CurrentUICulture = null!;
-        CultureInfo.CurrentCulture = null!;
-        CultureInfo.CurrentUICulture = null!;
+        ReleaseUnmanagedResources();
+    }
+
+    private static void ReleaseUnmanagedResources()
+    {
+        Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+        Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
+        CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+        CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
         CultureInfo.DefaultThreadCurrentCulture = null;
         CultureInfo.DefaultThreadCurrentUICulture = null;
+
+    }
+
+    public void Dispose()
+    {
+        ReleaseUnmanagedResources();
+        GC.SuppressFinalize(this);
     }
 
     public override ILocalizationManager CreateSystemUnderTest()