Added tests for deprecated and advertised API versions

Author: Chris Martinez

test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Description/ControllerTypeCollection.cs

@@ -0,0 +1,17 @@
+namespace Microsoft.Web.Http.Description
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Linq;
+    using System.Web.Http.Dispatcher;
+
+    public class ControllerTypeCollection : Collection<Type>, IHttpControllerTypeResolver
+    {
+        public ControllerTypeCollection() { }
+
+        public ControllerTypeCollection( params Type[] controllerTypes ) : base( controllerTypes.ToList() ) { }
+
+        public ICollection<Type> GetControllerTypes( IAssembliesResolver assembliesResolver ) => this;
+    }
+}

test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Description/TestConfigurations.cs

@@ -2,9 +2,7 @@
 {
     using Microsoft.Web.Http.Versioning.Conventions;
     using Models;
-    using Moq;
     using Simulators;
-    using System;
     using System.Collections;
     using System.Collections.Generic;
     using System.Web.Http;
@@ -24,7 +22,7 @@ public IEnumerator<object[]> GetEnumerator()
         static HttpConfiguration NewConventionRouteConfiguration()
         {
             var configuration = new HttpConfiguration();
-            var controllerTypeResolver = NewControllerTypeResolver(
+            var controllerTypeResolver = new ControllerTypeCollection(
                 typeof( ValuesController ),
                 typeof( Values2Controller ),
                 typeof( Values3Controller ) );
@@ -38,9 +36,12 @@ static HttpConfiguration NewConventionRouteConfiguration()
                                        .HasApiVersion( 1, 0 );
                     options.Conventions.Controller<Values2Controller>()
                                        .HasApiVersion( 2, 0 )
+                                       .HasDeprecatedApiVersion( 3, 0, "beta" )
                                        .HasApiVersion( 3, 0 )
                                        .Action( c => c.Post( default( ClassWithId ) ) ).MapToApiVersion( 3, 0 );
-                    options.Conventions.Controller<Values3Controller>().HasApiVersion( 4, 0 );
+                    options.Conventions.Controller<Values3Controller>()
+                                       .HasApiVersion( 4, 0 )
+                                       .AdvertisesApiVersion( 5, 0 );
                 } );
 
             return configuration;
@@ -49,7 +50,7 @@ static HttpConfiguration NewConventionRouteConfiguration()
         static HttpConfiguration NewDirectRouteConfiguration()
         {
             var configuration = new HttpConfiguration();
-            var controllerTypeResolver = NewControllerTypeResolver(
+            var controllerTypeResolver = new ControllerTypeCollection(
                 typeof( AttributeValues1Controller ),
                 typeof( AttributeValues2Controller ),
                 typeof( AttributeValues3Controller ) );
@@ -60,12 +61,5 @@ static HttpConfiguration NewDirectRouteConfiguration()
 
             return configuration;
         }
-
-        static IHttpControllerTypeResolver NewControllerTypeResolver( params Type[] controllerTypes )
-        {
-            var controllerTypeResolver = new Mock<IHttpControllerTypeResolver>();
-            controllerTypeResolver.Setup( c => c.GetControllerTypes( It.IsAny<IAssembliesResolver>() ) ).Returns( controllerTypes );
-            return controllerTypeResolver.Object;
-        }
     }
 }

test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Description/VersionedApiExplorerTest.cs

@@ -231,6 +231,7 @@ public void api_descriptions_should_collate_expected_versions( HttpConfiguration
             descriptions.ApiVersions.Should().Equal(
                 new ApiVersion( 1, 0 ),
                 new ApiVersion( 2, 0 ),
+                new ApiVersion( 3, 0, "beta" ),
                 new ApiVersion( 3, 0 ),
                 new ApiVersion( 4, 0 ) );
         }
@@ -377,6 +378,42 @@ public void api_description_group_should_explore_v3_actions( HttpConfiguration c
                 options => options.ExcludingMissingMembers() );
         }
 
+        [Theory]
+        [ClassData( typeof( TestConfigurations ) )]
+        public void api_description_group_should_explore_v3_beta_actions( HttpConfiguration configuration )
+        {
+            // arrange
+            var apiExplorer = new VersionedApiExplorer( configuration );
+            var apiVersion = new ApiVersion( 3, 0, "beta" );
+            var descriptionGroup = apiExplorer.ApiDescriptions[apiVersion];
+
+            // act
+            var descriptions = descriptionGroup.ApiDescriptions;
+            var relativePaths = descriptions.Select( d => d.RelativePath ).ToArray();
+
+            // assert
+            descriptionGroup.IsDeprecated.Should().BeTrue();
+            descriptions.ShouldBeEquivalentTo(
+                new[]
+                {
+                    new
+                    {
+                        ID = $"GET{relativePaths[0]}-3.0-beta",
+                        HttpMethod = Get,
+                        RelativePath = relativePaths[0],
+                        Version = apiVersion
+                    },
+                    new
+                    {
+                        ID = $"GET{relativePaths[1]}-3.0-beta",
+                        HttpMethod = Get,
+                        RelativePath = relativePaths[1],
+                        Version = apiVersion
+                    }
+                },
+                options => options.ExcludingMissingMembers() );
+        }
+
         [Theory]
         [ClassData( typeof( TestConfigurations ) )]
         public void api_description_group_should_explore_v4_actions( HttpConfiguration configuration )

test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Simulators/AttributeValues2Controller.cs

@@ -4,6 +4,7 @@
     using System.Web.Http;
 
     [ApiVersion( "2.0" )]
+    [ApiVersion( "3.0-beta", Deprecated = true )]
     [ApiVersion( "3.0" )]
     [RoutePrefix( "values" )]
     public class AttributeValues2Controller : ApiController

test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Simulators/AttributeValues3Controller.cs

@@ -5,6 +5,7 @@
     using static System.Net.HttpStatusCode;
 
     [ApiVersion( "4.0" )]
+    [AdvertiseApiVersions( "5.0" )]
     [RoutePrefix( "values" )]
     public class AttributeValues3Controller : ApiController
     {