Update the test infra to account for the test app having a different …

…name when built from the inner loop solution. (#3359)
microsoft · Oct 30, 2020 · f503466 · f503466
1 parent da3964e
commit f503466
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs b/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
@@ -99,6 +99,19 @@ public static TestApplicationInfo MUXControlsTestApp
             }
         }
 
+        public static TestApplicationInfo MUXControlsInnerLoopTestApp
+        {
+            get
+            {
+#if USING_TAEF
+                string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!taef.executionengine.universal.App";
+#else
+                string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!App";
+#endif
+                return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe", "MUXControlsInnerLoopTestApp", "MUXControlsTestApp", "MUXControlsTestApp", MUXCertSerialNumber, MUXBaseAppxDir);
+            }
+        }
+
         public static TestApplicationInfo NugetPackageTestApp
         {
             get
@@ -197,7 +210,11 @@ public static void AssemblyInitialize(TestContext testContext, string certFileNa
 
         public static void AssemblyCleanup()
         {
+#if INNERLOOP_BUILD
+            AssemblyCleanupWorker(TestApplicationInfo.MUXControlsInnerLoopTestApp);
+#else
             AssemblyCleanupWorker(TestApplicationInfo.MUXControlsTestApp);
+#endif
         }
 
         public static void AssemblyCleanupWorker(TestApplicationInfo testAppInfo)
@@ -233,7 +250,11 @@ private static Application CreateApplication(TestApplicationInfo info)
 
         public static void Initialize(TestContext testContext)
         {
+#if INNERLOOP_BUILD
+            Initialize(testContext, TestApplicationInfo.MUXControlsInnerLoopTestApp);
+#else
             Initialize(testContext, TestApplicationInfo.MUXControlsTestApp);
+#endif
         }
 
         // Tests classes call this from their ClassInitialize methods to init our Application instance

diff --git a/test/testinfra/MUXTestInfra/MSTest/MUXTestInfra.MSTest.csproj b/test/testinfra/MUXTestInfra/MSTest/MUXTestInfra.MSTest.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
+
+    <DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/test/testinfra/MUXTestInfra/TAEF/MUXTestInfra.TAEF.csproj b/test/testinfra/MUXTestInfra/TAEF/MUXTestInfra.TAEF.csproj
@@ -6,6 +6,7 @@
     <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
 
     <DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
+    <DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>
 
     <TaefRootDirectory>$(NuGetPackageRoot)taef.redist.wlk\10.31.180822002\build\Binaries\x86\CoreClr\</TaefRootDirectory>
   </PropertyGroup>