WIP - Try to use Shared Project for Tests and UI components

michael-hawker · michael-hawker · commit b3a5ca319745 · 2020-11-19T11:39:18.000-08:00
diff --git a/UITests/UITests.App/App.xaml b/UITests/UITests.App/App.xaml
@@ -1,7 +1,4 @@
-﻿<Application
-    x:Class="UITests.App.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UITests.App">
-
-</Application>
+﻿<Application x:Class="UITests.App.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:UITests.App" />
diff --git a/UITests/UITests.App/App.xaml.cs b/UITests/UITests.App/App.xaml.cs
@@ -73,7 +73,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                     // When the navigation stack isn't restored navigate to the first page,
                     // configuring the new page by passing required information as a navigation
                     // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
+                    rootFrame.Navigate(typeof(MainTestHost), e.Arguments);
                 }
 
                 // Ensure the current window is active
diff --git a/UITests/UITests.App/MainTestHost.xaml b/UITests/UITests.App/MainTestHost.xaml
@@ -1,5 +1,5 @@
 ﻿<Page
-    x:Class="UITests.App.MainPage"
+    x:Class="UITests.App.MainTestHost"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:testhelpers="using:AppTestAutomationHelpers"
diff --git a/UITests/UITests.App/MainTestHost.xaml.cs b/UITests/UITests.App/MainTestHost.xaml.cs
@@ -10,11 +10,14 @@
 
 namespace UITests.App
 {
-    public sealed partial class MainPage
+    /// <summary>
+    /// MainPage hosting all other test pages.
+    /// </summary>
+    public sealed partial class MainTestHost
     {
         private readonly Dictionary<string, Type> pageMap;
 
-        public MainPage()
+        public MainTestHost()
         {
             InitializeComponent();
             pageMap = ((App)Application.Current).TestPages;
diff --git a/UITests/UITests.App/Pages/SimpleTest.xaml b/UITests/UITests.App/Pages/SimpleTest.xaml
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
@@ -130,15 +130,9 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainPage.xaml.cs">
+    <Compile Include="MainTestHost.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\SimpleTest.xaml.cs">
-      <DependentUpon>SimpleTest.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\Controls\TextBoxMaskTestPage.xaml.cs">
-      <DependentUpon>TextBoxMaskTestPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -161,17 +155,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Pages\SimpleTest.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="MainTestHost.xaml">
       <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pages\Controls\TextBoxMaskTestPage.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
   <ItemGroup>
@@ -266,4 +252,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -13,6 +13,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
+
+    <IsTestHarness>true</IsTestHarness>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,5 +29,5 @@
     <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
   </ItemGroup>
 
-  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml.cs
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
@@ -17,7 +17,7 @@
 namespace UITests.Tests
 {
     [TestClass]
-    public class Test : UITest
+    public class SimpleTest : UITest
     {
         [ClassInitialize]
         [TestProperty("RunAs", "User")]
@@ -36,7 +36,7 @@ public static void ClassCleanup()
 
         [TestMethod]
         [TestPage("SimpleTest")]
-        public void SimpleTest()
+        public void SimpleTestMethod()
         {
             var button = new Button(FindElement.ByName("Click Me"));
             var textBlock = new TextBlock(FindElement.ById("textBlock"));
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml
@@ -0,0 +1,14 @@
+﻿<Page x:Class="UITests.App.Pages.SimpleTest"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+        <Button Click="Button_Click"
+                Content="Click Me" />
+        <TextBlock x:Name="textBlock" />
+    </StackPanel>
+</Page>
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs
@@ -10,7 +10,7 @@ namespace UITests.App.Pages
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class SimpleTest : Page
+    public sealed partial class SimpleTestPage : Page
     {
         public SimpleTest()
         {
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
@@ -8,14 +8,27 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>UITests.Tests.Shared</Import_RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)UITest.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tests\Test.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tests\TextBoxMask.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)Tests\" />
-  </ItemGroup>
+
+  <Choose>
+    <!-- When we're in the test harness include all '*Test.cs' files -->
+    <When Condition="'$(IsTestHarness)' == 'true' or '$(IsSharedProject)' == 'true'">
+      <ItemGroup>
+        <Compile Include="**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
+        <!-- Base test helpers -->
+        <Compile Include="$(MSBuildThisFileDirectory)UITest.cs" />
+        <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
+        <Compile Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <Choose>
+    <!-- When we're in the UI app used by the test harness, include all the pages -->
+    <When Condition="'$(IsTestHarness)' != 'true' or '$(IsSharedProject)' == 'true'">
+      <ItemGroup>
+        <Page Include="**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+        <Compile Include="**\*Page.xaml.cs" DependentUpon="%(Filename)" />
+      </ItemGroup>
+    </When>
+  </Choose>
 </Project>
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj
@@ -3,6 +3,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>1d8b0260-5c17-41da-9c38-1e37441b3925</ProjectGuid>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+
+    <IsSharedProject>true</IsSharedProject>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -15,6 +15,8 @@
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <IsPackable>false</IsPackable>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+    <IsTestHarness>true</IsTestHarness>
   </PropertyGroup>
 
   <ItemGroup>
@@ -64,5 +66,5 @@
     </None>
   </ItemGroup>
 
-  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
@@ -139,14 +139,17 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UIT
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{1d8b0260-5c17-41da-9c38-1e37441b3925}*SharedItemsImports = 13
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{5f720475-e263-4a5a-8c88-2b805b45b5bc}*SharedItemsImports = 5
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{c8182ef0-77fb-4b43-a588-c71748a309c7}*SharedItemsImports = 5
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{efa96b3c-857e-4659-b942-6bef7719f4ca}*SharedItemsImports = 4
 	EndGlobalSection

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)`
`73`	`73`	`// When the navigation stack isn't restored navigate to the first page,`
`74`	`74`	`// configuring the new page by passing required information as a navigation`
`75`	`75`	`// parameter`
`76`		`- rootFrame.Navigate(typeof(MainPage), e.Arguments);`
	`76`	`+ rootFrame.Navigate(typeof(MainTestHost), e.Arguments);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// Ensure the current window is active`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,14 @@`
`10`	`10`
`11`	`11`	`namespace UITests.App`
`12`	`12`	`{`
`13`		`- public sealed partial class MainPage`
	`13`	`+ /// <summary>`
	`14`	`+ /// MainPage hosting all other test pages.`
	`15`	`+ /// </summary>`
	`16`	`+ public sealed partial class MainTestHost`
`14`	`17`	`{`
`15`	`18`	`private readonly Dictionary<string, Type> pageMap;`
`16`	`19`
`17`		`- public MainPage()`
	`20`	`+ public MainTestHost()`
`18`	`21`	`{`
`19`	`22`	`InitializeComponent();`
`20`	`23`	`pageMap = ((App)Application.Current).TestPages;`