From 4cd4fc8490ebfca7e73142056b1b21e0d22ea09f Mon Sep 17 00:00:00 2001
From: "Zhaopeng Wang (from Dev Box)" <zhaopengwang@microsoft.com>
Date: Thu, 13 Feb 2025 16:37:09 +0800
Subject: [PATCH] add Session Init in UITestBase.cs

---
 src/UITestAPI/UITestBase.cs                                    | 3 +++
 src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/UITestAPI/UITestBase.cs b/src/UITestAPI/UITestBase.cs
index 0ea034402c..7bde318e65 100644
--- a/src/UITestAPI/UITestBase.cs
+++ b/src/UITestAPI/UITestBase.cs
@@ -27,17 +27,20 @@ namespace Microsoft.PowerToys.UITest
         public UITestBase()
         {
             SessionManager.Init();
+            Session = SessionManager.Current;
         }
 
         public UITestBase(PowerToysModule scope)
         {
             SessionManager.SetScope(scope);
             SessionManager.Init();
+            Session = SessionManager.Current;
         }
 
         ~UITestBase()
         {
             SessionManager.UnInit();
+            Session = null;
         }
 
         public static void Enable_Module_from_Dashboard(string moduleName, PowerToysModuleWindow module = PowerToysModuleWindow.None)
diff --git a/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
index 9e4cf70f36..7426b01bba 100644
--- a/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
@@ -20,9 +20,6 @@ namespace UITests_FancyZones
         public void RunFancyZones()
         {
             Thread.Sleep(2000);
-            Session = SessionManager.Current;
-            Assert.IsNotNull(Session, "Session is null");
-
             Session?.FindElementByName<Element>("Launch layout editor").Click();
             Thread.Sleep(4000);
             Session = SessionManager.AttachSession(PowerToysModuleWindow.Fancyzone);