Use MvcTextFixture as much as possible

- #3066
  - reduce `TestServer` -> `PhysicalFileProvider` -> `FileSystemWatcher` count enough to run with Core CLR on Linux
- remove use of `HttpClient.DefaultRequestHeaders`; any client change affects other tests
- remove use of `RequestBuilder` class; creates a per-test `HttpClient` and requires the `TestServer`
- updated a few expectations because `CommonTestEncoder` does JavaScript a bit differently
  - "JavaScriptEncode[[...]]" -> "JavaScriptStringEncode[[...]]"
- side benefit: xUnit reports functional tests execute for only ~12.4s; was >30s before this change

Infrastructure: Enhance `MvcTestFixture`
- handle `ConfigureServices()` methods that are not `void`
- handle `Configure(IApplicationBuilder, ILoggerFactory)`
- ensure server is initialized with consistent `CurrentCulture` and `CurrentUICulture`
- add `FilteredDefaultAssemblyProviderFixture<TStartup>` and `MvcEncodedTestFixture<TStartup>`
  - add `MvcTextFixture.AddAdditionalServices()` extension point supporting these

- do not expose the `TestServer`; an anti-pattern for tests to manipulate the server
- update class names to match containing files
- use existing `TestApplicationEnvironment`
  - apply some `MvcTestFixture` improvements to the shared `TestApplicationEnvironment` class
- remove unused methods from `TestHelper`

nits:
- touched-up some leftover `_app` &c declarations to be more explicit and minimize `using`s
- moved statements into correct sections of methods in `RoutingTests`
- removed `TestLoggerFactory` and related classes from `TagHelperSampleTest`

Author: dougbu

test/Microsoft.AspNet.Mvc.FunctionalTests/ActionResultTests.cs

@@ -12,9 +12,9 @@
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class ActionResultTests : IClassFixture<MvcFixture<ActionResultsWebSite.Startup>>
+    public class ActionResultTests : IClassFixture<MvcTestFixture<ActionResultsWebSite.Startup>>
     {
-        public ActionResultTests(MvcFixture<ActionResultsWebSite.Startup> fixture)
+        public ActionResultTests(MvcTestFixture<ActionResultsWebSite.Startup> fixture)
         {
             Client = fixture.Client;
         }

test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs

@@ -8,9 +8,9 @@
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class ActivatorTests : IClassFixture<MvcFixture<ActivatorWebSite.Startup>>
+    public class ActivatorTests : IClassFixture<MvcTestFixture<ActivatorWebSite.Startup>>
     {
-        public ActivatorTests(MvcFixture<ActivatorWebSite.Startup> fixture)
+        public ActivatorTests(MvcTestFixture<ActivatorWebSite.Startup> fixture)
         {
             Client = fixture.Client;
         }

test/Microsoft.AspNet.Mvc.FunctionalTests/AntiforgeryTests.cs

@@ -1,35 +1,31 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class AntiforgeryTests
+    public class AntiforgeryTests : IClassFixture<MvcTestFixture<AntiforgeryTokenWebSite.Startup>>
     {
-        private const string SiteName = nameof(AntiforgeryTokenWebSite);
-        private readonly Action<IApplicationBuilder> _app = new AntiforgeryTokenWebSite.Startup().Configure;
-        private readonly Action<IServiceCollection> _configureServices = new AntiforgeryTokenWebSite.Startup().ConfigureServices;
+        public AntiforgeryTests(MvcTestFixture<AntiforgeryTokenWebSite.Startup> fixture)
+        {
+            Client = fixture.Client;
+        }
+
+        public HttpClient Client { get; }
 
         [Fact]
         public async Task MultipleAFTokensWithinTheSamePage_GeneratesASingleCookieToken()
         {
-            // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Account/Login");
 
-            // Act
-            var response = await client.GetAsync("http://localhost/Account/Login");
-
-            //Assert
+            // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             var header = Assert.Single(response.Headers.GetValues("X-Frame-Options"));
             Assert.Equal("SAMEORIGIN", header);
@@ -45,11 +41,8 @@ public async Task MultipleAFTokensWithinTheSamePage_GeneratesASingleCookieToken(
         public async Task MultipleFormPostWithingASingleView_AreAllowed()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
-            // do a get response.
-            var getResponse = await client.GetAsync("http://localhost/Account/Login");
+            // Do a get request.
+            var getResponse = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
 
             // Get the AF token for the second login. If the cookies are generated twice(i.e are different),
@@ -69,7 +62,7 @@ public async Task MultipleFormPostWithingASingleView_AreAllowed()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -80,10 +73,7 @@ public async Task MultipleFormPostWithingASingleView_AreAllowed()
         public async Task InvalidCookieToken_Throws()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
-            var getResponse = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
             var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseBody, "Account/Login");
 
@@ -101,7 +91,7 @@ public async Task InvalidCookieToken_Throws()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             var exception = response.GetServerException();
@@ -112,10 +102,7 @@ public async Task InvalidCookieToken_Throws()
         public async Task InvalidFormToken_Throws()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
-            var getResponse = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
             var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
             var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Account/Login");
@@ -131,7 +118,7 @@ public async Task InvalidFormToken_Throws()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             var exception = response.GetServerException();
@@ -142,16 +129,13 @@ public async Task InvalidFormToken_Throws()
         public async Task IncompatibleCookieToken_Throws()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
             // do a get response.
             // We do two requests to get two different sets of antiforgery cookie and token values.
-            var getResponse1 = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse1 = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody1 = await getResponse1.Content.ReadAsStringAsync();
             var formToken1 = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseBody1, "Account/Login");
 
-            var getResponse2 = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse2 = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody2 = await getResponse2.Content.ReadAsStringAsync();
             var cookieToken2 = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse2);
 
@@ -169,7 +153,7 @@ public async Task IncompatibleCookieToken_Throws()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             var exception = response.GetServerException();
@@ -180,11 +164,8 @@ public async Task IncompatibleCookieToken_Throws()
         public async Task MissingCookieToken_Throws()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
             // do a get response.
-            var getResponse = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
             var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseBody, "Account/Login");
             var cookieTokenKey = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse).Key;
@@ -200,7 +181,7 @@ public async Task MissingCookieToken_Throws()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             var exception = response.GetServerException();
@@ -213,9 +194,7 @@ public async Task MissingCookieToken_Throws()
         public async Task MissingAFToken_Throws()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-            var getResponse = await client.GetAsync("http://localhost/Account/Login");
+            var getResponse = await Client.GetAsync("http://localhost/Account/Login");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
             var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
 
@@ -230,7 +209,7 @@ public async Task MissingAFToken_Throws()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             var exception = response.GetServerException();
@@ -241,12 +220,8 @@ public async Task MissingAFToken_Throws()
         [Fact]
         public async Task SetCookieAndHeaderBeforeFlushAsync_GeneratesCookieTokenAndHeader()
         {
-            // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
-            // Act
-            var response = await client.GetAsync("http://localhost/Account/FlushAsyncLogin");
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Account/FlushAsyncLogin");
 
             // Assert
             var header = Assert.Single(response.Headers.GetValues("X-Frame-Options"));
@@ -260,11 +235,8 @@ public async Task SetCookieAndHeaderBeforeFlushAsync_GeneratesCookieTokenAndHead
         public async Task SetCookieAndHeaderBeforeFlushAsync_PostToForm()
         {
             // Arrange
-            var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
-            var client = server.CreateClient();
-
             // do a get response.
-            var getResponse = await client.GetAsync("http://localhost/Account/FlushAsyncLogin");
+            var getResponse = await Client.GetAsync("http://localhost/Account/FlushAsyncLogin");
             var responseBody = await getResponse.Content.ReadAsStringAsync();
 
             var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseBody, "Account/FlushAsyncLogin");
@@ -282,7 +254,7 @@ public async Task SetCookieAndHeaderBeforeFlushAsync_PostToForm()
             request.Content = new FormUrlEncodedContent(nameValueCollection);
 
             // Act
-            var response = await client.SendAsync(request);
+            var response = await Client.SendAsync(request);
 
             // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);