[Templating][Components] Unify and improve E2E testing infrastructure

* Unify the Templating and Components testing infrastructure.
* Enable test project discovery in the components E2E tests.

Author: javiercn

src/Components/test/E2ETest/Infrastructure/BasicTestAppTestBase.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Infrastructure/CaptureSeleniumLogsAttribute.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -24,7 +24,7 @@ protected override IWebHost CreateWebHost()
             }
 
             var sampleSitePath = FindSampleOrTestSitePath(
-                BuildWebHostMethod.Method.DeclaringType.Assembly.GetName().Name);
+                BuildWebHostMethod.Method.DeclaringType.Assembly.FullName);
 
             return BuildWebHostMethod(new[]
             {

src/Components/test/E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Hosting;
@@ -16,7 +16,7 @@ public class DevHostServerFixture<TProgram> : WebHostServerFixture
         protected override IWebHost CreateWebHost()
         {
             ContentRoot = FindSampleOrTestSitePath(
-                typeof(TProgram).Assembly.GetName().Name);
+                typeof(TProgram).Assembly.FullName);
 
             var args = new List<string>
             {

src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures
@@ -27,26 +28,13 @@ public ServerFixture()
 
         protected abstract string StartAndGetRootUri();
 
-        protected static string FindSolutionDir()
-        {
-            return FindClosestDirectoryContaining(
-                "Components.sln",
-                Path.GetDirectoryName(typeof(ServerFixture).Assembly.Location));
-        }
-
         private static Dictionary<string, string> FindProjects()
         {
-            var solutionDir = FindSolutionDir();
-
-            var testAssetsDirectories = new[]
-            {
-                Path.Combine(solutionDir, "test", "testassets"),
-                Path.Combine(solutionDir, "blazor", "testassets"),
-            };
-
-            return testAssetsDirectories
-                .SelectMany(d => new DirectoryInfo(d).EnumerateDirectories())
-                .ToDictionary(d => d.Name, d => d.FullName);
+            return typeof(ServerFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                .Where(m => m.Key.StartsWith("TestAssemblyApplication["))
+                .ToDictionary(m =>
+                    m.Key.Replace("TestAssemblyApplication", "").TrimStart('[').TrimEnd(']'),
+                    m => m.Value);
         }
 
         protected static string FindSampleOrTestSitePath(string projectName)
@@ -60,28 +48,6 @@ protected static string FindSampleOrTestSitePath(string projectName)
             throw new ArgumentException($"Cannot find a sample or test site with name '{projectName}'.");
         }
 
-        private static string FindClosestDirectoryContaining(
-            string filename,
-            string startDirectory)
-        {
-            var dir = startDirectory;
-            while (true)
-            {
-                if (File.Exists(Path.Combine(dir, filename)))
-                {
-                    return dir;
-                }
-
-                dir = Directory.GetParent(dir)?.FullName;
-                if (string.IsNullOrEmpty(dir))
-                {
-                    throw new FileNotFoundException(
-                        $"Could not locate a file called '{filename}' in " +
-                        $"directory '{startDirectory}' or any parent directory.");
-                }
-            }
-        }
-
         protected static void RunInBackgroundThread(Action action)
         {
             var isDone = new ManualResetEvent(false);

src/Components/test/E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using System;
 using Xunit;
 using Xunit.Abstractions;

src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <!-- Shared testing infrastructure for running E2E tests using selenium -->
+  <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);node_modules\**</DefaultItemExcludes>
-    <!-- WebDriver is not strong-named signed -->
-    <SignAssembly>false</SignAssembly>
 
     <!--
       Temporarily disabled until this runs on macOS
@@ -18,20 +18,10 @@
     <Compile Include="$(SharedSourceRoot)Process\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
 
-  <!-- Version of this SDK is set in global.json -->
-  <Sdk Name="Yarn.MSBuild" />
-
-  <Target Name="EnsureNodeJSRestored" BeforeTargets="Build" Condition="'$(BlazorAllTests)'=='true'">
-    <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
-    <Yarn Command="install" />
-  </Target>
-
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
-    <Reference Include="Selenium.Support" />
-    <Reference Include="Selenium.WebDriver" />
   </ItemGroup>
 
   <ItemGroup>
@@ -48,4 +38,7 @@
     <ProjectReference Include="..\testassets\TestServer\TestServer.csproj" />
   </ItemGroup>
 
+  <!-- Shared testing infrastructure for running E2E tests using selenium -->
+  <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.targets" />
+
 </Project>

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

@@ -1,14 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using BasicTestApp;
-using Microsoft.AspNetCore.Components.Browser.Rendering;
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Tests;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
-using System;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 

src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Tests;
+using Microsoft.AspNetCore.E2ETesting;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests

src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs

@@ -4,6 +4,7 @@
 using BasicTestApp.HttpClientTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using Xunit;

src/Components/test/E2ETest/Tests/BindTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using Xunit;
 using Xunit.Abstractions;

src/Components/test/E2ETest/Tests/CascadingValueTest.cs

@@ -11,6 +11,7 @@
 using BasicTestApp.HierarchicalImportsTest.Subdir;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using Xunit;

src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using System;
 using Xunit;

src/Components/test/E2ETest/Tests/EventBubblingTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using Xunit;
 using Xunit.Abstractions;

src/Components/test/E2ETest/Tests/EventCallbackTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;

src/Components/test/E2ETest/Tests/EventTest.cs

@@ -5,6 +5,7 @@
 using BasicTestApp.FormsTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Tests/FormsTest.cs

@@ -1,8 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs

@@ -4,6 +4,7 @@
 using BasicTestApp.HttpClientTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Tests/HttpClientTest.cs

@@ -3,6 +3,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using Xunit;

src/Components/test/E2ETest/Tests/InteropTest.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;

src/Components/test/E2ETest/Tests/MonoSanityTest.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using System;
 using System.Linq;

src/Components/test/E2ETest/Tests/PerformanceTest.cs

@@ -8,6 +8,7 @@
 using BasicTestApp.RouterTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;

src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;