diff --git a/src/modules/fancyzones/UITests-FancyZones/Init.cs b/src/modules/fancyzones/UITests-FancyZones/Init.cs new file mode 100644 index 0000000000..a37dd30b82 --- /dev/null +++ b/src/modules/fancyzones/UITests-FancyZones/Init.cs @@ -0,0 +1,45 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Diagnostics; +using System.IO; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Microsoft.FancyZonesEditor.UITests +{ + [TestClass] + public class Init + { + private static Process? appDriver; + + [AssemblyInitialize] + public static void SetupAll(TestContext context) + { + string? sourceDirPath = Environment.GetEnvironmentVariable("SrcPath"); // get source dir in CI + if (sourceDirPath == null) + { + sourceDirPath = Path.GetFullPath($"{Environment.CurrentDirectory}" + @".\..\..\..\..\..\"); // local + } + + context.WriteLine($"Source dir: {sourceDirPath}"); + string winAppDriver = Path.Combine(sourceDirPath, @".\deps\WinAppDriver", "WinAppDriver.exe"); + + context.WriteLine($"Attempting to launch WinAppDriver at: {winAppDriver}"); + appDriver = Process.Start(winAppDriver); + } + + [AssemblyCleanup] + public static void CleanupAll() + { + try + { + appDriver?.Kill(); + } + catch + { + } + } + } +} diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/Init.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/Init.cs index 804c3324b3..a37dd30b82 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/Init.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/Init.cs @@ -23,12 +23,10 @@ namespace Microsoft.FancyZonesEditor.UITests sourceDirPath = Path.GetFullPath($"{Environment.CurrentDirectory}" + @".\..\..\..\..\..\"); // local } - context.WriteLine($"source dir: {sourceDirPath}"); + context.WriteLine($"Source dir: {sourceDirPath}"); string winAppDriver = Path.Combine(sourceDirPath, @".\deps\WinAppDriver", "WinAppDriver.exe"); context.WriteLine($"Attempting to launch WinAppDriver at: {winAppDriver}"); - context.WriteLine($"Working directory: {Environment.CurrentDirectory}"); - appDriver = Process.Start(winAppDriver); }