From 7396ea0c47d8ef43c53409fb39cd08094bee3192 Mon Sep 17 00:00:00 2001
From: "Zhaopeng Wang (from Dev Box)" <zhaopengwang@microsoft.com>
Date: Fri, 6 Jun 2025 05:22:51 +0800
Subject: [PATCH] delete change code

---
 src/common/UITestAutomation/Session.cs       | 109 +++++++++----------
 src/common/UITestAutomation/SessionHelper.cs |   9 +-
 2 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/src/common/UITestAutomation/Session.cs b/src/common/UITestAutomation/Session.cs
index 95a1be8e20..b3924b8b19 100644
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -345,9 +345,9 @@ namespace Microsoft.PowerToys.UITest
         {
             PerformAction(
                 () =>
-            {
-                KeyboardHelper.SendKey(key);
-            },
+                {
+                    KeyboardHelper.SendKey(key);
+                },
                 msPreAction,
                 msPostAction);
         }
@@ -385,9 +385,9 @@ namespace Microsoft.PowerToys.UITest
         {
             PerformAction(
                 () =>
-         {
-             MouseHelper.MoveMouseTo(x, y);
-         },
+                {
+                    MouseHelper.MoveMouseTo(x, y);
+                },
                 msPreAction,
                 msPostAction);
         }
@@ -402,53 +402,52 @@ namespace Microsoft.PowerToys.UITest
         {
             PerformAction(
                 () =>
-            {
-                switch (action)
                 {
-                    case MouseActionType.LeftClick:
-                        MouseHelper.LeftClick();
-                        break;
-                    case MouseActionType.RightClick:
-                        MouseHelper.RightClick();
-                        break;
-                    case MouseActionType.MiddleClick:
-                        MouseHelper.MiddleClick();
-                        break;
-                    case MouseActionType.LeftDoubleClick:
-                        MouseHelper.LeftDoubleClick();
-                        break;
-                    case MouseActionType.RightDoubleClick:
-                        MouseHelper.RightDoubleClick();
-                        break;
-                    case MouseActionType.LeftDown:
-                        MouseHelper.LeftDown();
-                        break;
-                    case MouseActionType.LeftUp:
-                        MouseHelper.LeftUp();
-                        break;
-                    case MouseActionType.RightDown:
-                        MouseHelper.RightDown();
-                        break;
-                    case MouseActionType.RightUp:
-                        MouseHelper.RightUp();
-                        break;
-                    case MouseActionType.MiddleDown:
-                        MouseHelper.MiddleDown();
-                        break;
-                    case MouseActionType.MiddleUp:
-                        MouseHelper.MiddleUp();
-                        break;
-                    case MouseActionType.ScrollUp:
-                        MouseHelper.ScrollUp();
-                        break;
-                    case MouseActionType.ScrollDown:
-                        MouseHelper.ScrollDown();
-                        break;
-                    default:
-                        throw new ArgumentException("Unsupported mouse action.", nameof(action));
-                        throw new ArgumentException("Unsupported mouse action.", nameof(action));
-                }
-            },
+                    switch (action)
+                    {
+                        case MouseActionType.LeftClick:
+                            MouseHelper.LeftClick();
+                            break;
+                        case MouseActionType.RightClick:
+                            MouseHelper.RightClick();
+                            break;
+                        case MouseActionType.MiddleClick:
+                            MouseHelper.MiddleClick();
+                            break;
+                        case MouseActionType.LeftDoubleClick:
+                            MouseHelper.LeftDoubleClick();
+                            break;
+                        case MouseActionType.RightDoubleClick:
+                            MouseHelper.RightDoubleClick();
+                            break;
+                        case MouseActionType.LeftDown:
+                            MouseHelper.LeftDown();
+                            break;
+                        case MouseActionType.LeftUp:
+                            MouseHelper.LeftUp();
+                            break;
+                        case MouseActionType.RightDown:
+                            MouseHelper.RightDown();
+                            break;
+                        case MouseActionType.RightUp:
+                            MouseHelper.RightUp();
+                            break;
+                        case MouseActionType.MiddleDown:
+                            MouseHelper.MiddleDown();
+                            break;
+                        case MouseActionType.MiddleUp:
+                            MouseHelper.MiddleUp();
+                            break;
+                        case MouseActionType.ScrollUp:
+                            MouseHelper.ScrollUp();
+                            break;
+                        case MouseActionType.ScrollDown:
+                            MouseHelper.ScrollDown();
+                            break;
+                        default:
+                            throw new ArgumentException("Unsupported mouse action.", nameof(action));
+                    }
+                },
                 msPreAction,
                 msPostAction);
         }
@@ -580,9 +579,9 @@ namespace Microsoft.PowerToys.UITest
         {
             PerformAction(
                 () =>
-            {
-                StartExeInternal(executablePath, arguments);
-            },
+                {
+                    StartExeInternal(executablePath, arguments);
+                },
                 msPreAction,
                 msPostAction);
         }
diff --git a/src/common/UITestAutomation/SessionHelper.cs b/src/common/UITestAutomation/SessionHelper.cs
index 751e04f712..75ae254e98 100644
--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/src/common/UITestAutomation/SessionHelper.cs
@@ -9,7 +9,6 @@ using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
-using static Microsoft.PowerToys.UITest.WindowHelper;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -79,7 +78,6 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public void Cleanup()
         {
-            this.Root.Quit();
             ExitScopeExe();
             try
             {
@@ -168,12 +166,7 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public void ExitScopeExe()
         {
-            if (this.Driver != null)
-            {
-                // If the driver is already initialized, quit it before starting a new one
-                this.Driver.Quit();
-                this.Driver = null;
-            }
+            ExitExe(sessionPath);
         }
 
         /// <summary>