Merge pull request #172 from Youssef1313/fix-exception

fix: Fix exception when setting CurrentTestWindow
unoplatform · Mar 18, 2024 · 26154bd · 26154bd
2 parents 08becaa + 57f1164
commit 26154bd
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsUIContentHelper.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsUIContentHelper.cs
@@ -43,7 +43,6 @@ namespace Uno.UI.RuntimeTests;
 
 public static class UnitTestsUIContentHelper
 {
-	private static Window? _currentTestWindow;
 	private static UIElement? _originalWindowContent;
 
 	internal static (UIElement Control, Func<UIElement?> GetContent, Action<UIElement?> SetContent) EmbeddedTestRoot { get; set; }
@@ -74,11 +73,7 @@ public static void RestoreOriginalContent()
 		}
 	}
 
-	public static Window? CurrentTestWindow
-	{
-		get => _currentTestWindow ?? throw new InvalidOperationException("Current test window not set.");
-		set => _currentTestWindow = value;
-	}
+	public static Window? CurrentTestWindow { get; set; }
 
 	public static UIElement? Content
 	{