dispose test helper on TestCleanup

Author: Rosuavio

UITests/UITests.Tests.Shared/UITestBase.cs

@@ -26,6 +26,8 @@ namespace UITests.Tests
 {
     public abstract class UITestBase
     {
+        private TestSetupHelper helper;
+
         public static TestApplicationInfo WinUICsUWPSampleApp
         {
             get
@@ -87,7 +89,10 @@ public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
         [TestInitialize]
         public async Task TestInitialize()
         {
-            PreTestSetup();
+            // This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs)
+            // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete
+            // our loading.
+            helper = new TestSetupHelper(new string[] { }, new TestSetupHelper.TestSetupHelperOptions());
 
 #if USING_TAEF
             var fullTestName = TestContext.TestName;
@@ -170,6 +175,12 @@ public async Task TestInitialize()
             throw new InvalidOperationException("Test host didn't confirm test ready to execute page: " + pageName);
         }
 
+        [TestCleanup]
+        public async Task TestCleanup()
+        {
+            helper.Dispose();
+        }
+
         private void CommunicationService_RequestReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
         {
             AppServiceDeferral messageDeferral = args.GetDeferral();
@@ -209,16 +220,5 @@ private void CommunicationService_RequestReceived(AppServiceConnection sender, A
                 messageDeferral.Complete();
             }
         }
-
-        // This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs)
-        // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete
-        // our loading.
-        private void PreTestSetup()
-        {
-            _ = new TestSetupHelper(new string[] { }, new TestSetupHelper.TestSetupHelperOptions()
-            {
-                AutomationIdOfSafeItemToClick = null
-            });
-        }
     }
 }