Update matching actions with a ITraceWriter and register ITraceWriter in acceptance tests. Fixes #119

Author: Chris Martinez

src/Microsoft.AspNet.WebApi.Versioning/Controllers/ActionSelectorCacheItem.cs

@@ -377,8 +377,9 @@ List<CandidateActionWithParams> FindActionMatchRequiredRouteAndQueryParameters(
                 foreach ( var candidate in candidatesFound )
                 {
                     var descriptor = candidate.ActionDescriptor;
+                    var candidateControllerDescriptor = Decorator.GetInner( descriptor.ControllerDescriptor );
 
-                    if ( descriptor.ControllerDescriptor == controllerDescriptor && IsSubset( actionParameterNames[descriptor], candidate.CombinedParameterNames ) )
+                    if ( candidateControllerDescriptor == controllerDescriptor && IsSubset( actionParameterNames[descriptor], candidate.CombinedParameterNames ) )
                     {
                         matches.Add( candidate );
                     }

test/Microsoft.AspNet.WebApi.Acceptance.Tests/AcceptanceTest.cs

@@ -6,6 +6,7 @@
     using System.Net.Http.Headers;
     using System.Web.Http;
     using System.Web.Http.Dispatcher;
+    using System.Web.Http.Tracing;
     using Xunit;
     using static System.String;
     using static System.Web.Http.IncludeErrorDetailPolicy;
@@ -17,6 +18,7 @@ protected AcceptanceTest()
         {
             Configuration.IncludeErrorDetailPolicy = Always;
             Configuration.Services.Replace( typeof( IHttpControllerTypeResolver ), FilteredControllerTypes );
+            Configuration.Services.Replace( typeof( ITraceWriter ), new TraceWriter() );
             Server = new HttpServer( Configuration );
             Client = new HttpClient( new HttpSimulatorHandler( Server ) )
             {

test/Microsoft.AspNet.WebApi.Acceptance.Tests/TraceWriter.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.Web
+{
+    using System;
+    using System.Net.Http;
+    using System.Web.Http.Tracing;
+
+    public sealed class TraceWriter : ITraceWriter
+    {
+        public void Trace( HttpRequestMessage request, string category, TraceLevel level, Action<TraceRecord> traceAction ) { }
+    }
+}

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

@@ -3,10 +3,13 @@
     using Microsoft.Web.Http.Versioning.Conventions;
     using Models;
     using Simulators;
+    using System;
     using System.Collections;
     using System.Collections.Generic;
+    using System.Net.Http;
     using System.Web.Http;
     using System.Web.Http.Dispatcher;
+    using System.Web.Http.Tracing;
     using static System.Web.Http.RouteParameter;
 
     public class TestConfigurations : IEnumerable<object[]>
@@ -28,6 +31,7 @@ static HttpConfiguration NewConventionRouteConfiguration()
                 typeof( Values3Controller ) );
 
             configuration.Services.Replace( typeof( IHttpControllerTypeResolver ), controllerTypeResolver );
+            configuration.Services.Replace( typeof( ITraceWriter ), new TraceWriter() );
             configuration.Routes.MapHttpRoute( "Default", "{controller}/{id}", new { id = Optional } );
             configuration.AddApiVersioning(
                 options =>
@@ -57,10 +61,16 @@ static HttpConfiguration NewDirectRouteConfiguration()
                 typeof( AttributeValues3Controller ) );
 
             configuration.Services.Replace( typeof( IHttpControllerTypeResolver ), controllerTypeResolver );
+            configuration.Services.Replace( typeof( ITraceWriter ), new TraceWriter() );
             configuration.MapHttpAttributeRoutes();
             configuration.AddApiVersioning();
 
             return configuration;
         }
+
+        sealed class TraceWriter : ITraceWriter
+        {
+            public void Trace( HttpRequestMessage request, string category, TraceLevel level, Action<TraceRecord> traceAction ) { }
+        }
     }
 }