Refactor acceptance tests to radically improve test performance

Author: Chris Martinez

test/Acceptance.Test.Shared/Acceptance.Test.Shared.projitems

@@ -10,7 +10,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AcceptanceTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AgreementsCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AdvancedODataCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BasicODataCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BasicCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConventionsODataCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ConventionsCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HttpContentExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HttpServerFixture.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OneApiError.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OneApiErrorResponse.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OneApiInnerError.cs" />

test/Acceptance.Test.Shared/AcceptanceTest.cs

@@ -13,23 +13,25 @@ namespace Microsoft.AspNetCore.Mvc
     using static System.Net.Http.HttpMethod;
 
     [Trait( "Kind", "Acceptance" )]
-    public abstract partial class AcceptanceTest : IDisposable
+#if WEBAPI
+    [Trait( "Framework", "Web API" )]
+#else
+    [Trait( "Framework", "ASP.NET Core" )]
+#endif
+    public abstract class AcceptanceTest
     {
         const string JsonMediaType = "application/json";
         static readonly HttpMethod Patch = new HttpMethod( "PATCH" );
-        readonly FilteredControllerTypes filteredControllerTypes = new FilteredControllerTypes();
-        bool disposed;
+        readonly HttpServerFixture fixture;
 
-        ~AcceptanceTest() => Dispose( false );
+        protected AcceptanceTest( HttpServerFixture fixture ) => this.fixture = fixture;
 
-        public void Dispose()
-        {
-            Dispose( true );
-            GC.SuppressFinalize( this );
-        }
+        protected HttpClient Client => fixture.Client;
 
         HttpRequestMessage CreateRequest<TEntity>( string requestUri, TEntity entity, HttpMethod method )
         {
+            AddDefaultAcceptHeaderIfNecessary();
+
             var request = new HttpRequestMessage( method, requestUri );
 
             if ( !Equals( entity, default( TEntity ) ) )
@@ -38,18 +40,13 @@ HttpRequestMessage CreateRequest<TEntity>( string requestUri, TEntity entity, Ht
                 request.Content = new ObjectContent<TEntity>( entity, formatter, JsonMediaType );
             }
 
-            Client.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( JsonMediaType ) );
-
             return request;
         }
 
         HttpRequestMessage CreateRequest( string requestUri, HttpContent content, HttpMethod method )
         {
-            var request = new HttpRequestMessage( method, requestUri ) { Content = content };
-
-            Client.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( JsonMediaType ) );
-
-            return request;
+            AddDefaultAcceptHeaderIfNecessary();
+            return new HttpRequestMessage( method, requestUri ) { Content = content };
         }
 
         protected virtual Task<HttpResponseMessage> GetAsync( string requestUri ) => Client.SendAsync( CreateRequest( requestUri, default( object ), Get ) );
@@ -67,5 +64,21 @@ HttpRequestMessage CreateRequest( string requestUri, HttpContent content, HttpMe
         protected virtual Task<HttpResponseMessage> PatchAsync( string requestUri, HttpContent content ) => Client.SendAsync( CreateRequest( requestUri, content, Patch ) );
 
         protected virtual Task<HttpResponseMessage> DeleteAsync( string requestUri ) => Client.SendAsync( CreateRequest( requestUri, default( object ), Delete ) );
+
+        void AddDefaultAcceptHeaderIfNecessary()
+        {
+            var accept = Client.DefaultRequestHeaders.Accept;
+            var comparer = StringComparer.OrdinalIgnoreCase;
+
+            foreach ( var item in accept )
+            {
+                if ( comparer.Equals( item.MediaType, JsonMediaType ) )
+                {
+                    return;
+                }
+            }
+
+            accept.Add( new MediaTypeWithQualityHeaderValue( JsonMediaType ) );
+        }
     }
 }

test/Acceptance.Test.Shared/AdvancedODataCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.AspNet.OData.Advanced
+#else
+namespace Microsoft.AspNetCore.OData.Advanced
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( AdvancedODataCollection ) )]
+    public sealed class AdvancedODataCollection : ICollectionFixture<AdvancedFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/AgreementsCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.Web.Http.ByNamespace
+#else
+namespace Microsoft.AspNetCore.Mvc.ByNamespace
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( AgreementsCollection ) )]
+    public class AgreementsCollection : ICollectionFixture<AgreementsFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/BasicCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.Web.Http.Basic
+#else
+namespace Microsoft.AspNetCore.Mvc.Basic
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( BasicCollection ) )]
+    public sealed class BasicCollection : ICollectionFixture<BasicFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/BasicODataCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.AspNet.OData.Basic
+#else
+namespace Microsoft.AspNetCore.OData.Basic
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( BasicODataCollection ) )]
+    public sealed class BasicODataCollection : ICollectionFixture<BasicFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/ConventionsCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.Web.Http.Conventions
+#else
+namespace Microsoft.AspNetCore.Mvc.Conventions
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( ConventionsCollection ) )]
+    public class ConventionsCollection : ICollectionFixture<ConventionsFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/ConventionsODataCollection.cs

@@ -0,0 +1,14 @@
+#if WEBAPI
+namespace Microsoft.AspNet.OData.Conventions
+#else
+namespace Microsoft.AspNetCore.OData.Conventions
+#endif
+{
+    using System;
+    using Xunit;
+
+    [CollectionDefinition( nameof( ConventionsODataCollection ) )]
+    public class ConventionsODataCollection : ICollectionFixture<ConventionsFixture>
+    {
+    }
+}

test/Acceptance.Test.Shared/HttpServerFixture.cs

@@ -0,0 +1,27 @@
+#if WEBAPI
+namespace Microsoft.Web
+#else
+namespace Microsoft.AspNetCore.Mvc
+#endif
+{
+    using System;
+    using System.Collections.Generic;
+#if !WEBAPI
+    using Type = System.Reflection.TypeInfo;
+#endif
+
+    public abstract partial class HttpServerFixture : IDisposable
+    {
+        bool disposed;
+
+        ~HttpServerFixture() => Dispose( false );
+
+        public void Dispose()
+        {
+            Dispose( true );
+            GC.SuppressFinalize( this );
+        }
+
+        public ICollection<Type> FilteredControllerTypes { get; } = new FilteredControllerTypes();
+    }
+}