added IHttpActionResult handling

Author: filipw

src/WebApi.OutputCache.V2/CacheOutputAttribute.cs

@@ -99,9 +99,15 @@ protected virtual MediaTypeHeaderValue GetExpectedMediaType(HttpConfiguration co
             var negotiator = config.Services.GetService(typeof(IContentNegotiator)) as IContentNegotiator;
             var returnType = actionContext.ActionDescriptor.ReturnType;
 
-            if (negotiator != null && returnType != typeof(HttpResponseMessage))
+            if (negotiator != null && returnType != typeof(HttpResponseMessage) && (returnType != typeof(IHttpActionResult) || typeof(IHttpActionResult).IsAssignableFrom(returnType)))
             {
                 var negotiatedResult = negotiator.Negotiate(returnType, actionContext.Request, config.Formatters);
+
+                if (negotiatedResult == null)
+                {
+                    return DefaultMediaType;
+                }
+
                 responseMediaType = negotiatedResult.MediaType;
                 if (string.IsNullOrWhiteSpace(responseMediaType.CharSet))
                 {
@@ -113,8 +119,7 @@ protected virtual MediaTypeHeaderValue GetExpectedMediaType(HttpConfiguration co
                 if (actionContext.Request.Headers.Accept != null)
                 {
                     responseMediaType = actionContext.Request.Headers.Accept.FirstOrDefault();
-                    if (responseMediaType == null ||
-                        !config.Formatters.Any(x => x.SupportedMediaTypes.Contains(responseMediaType)))
+                    if (responseMediaType == null || !config.Formatters.Any(x => x.SupportedMediaTypes.Contains(responseMediaType)))
                     {
                         return DefaultMediaType;
                     }

test/WebApi.OutputCache.V2.Tests/ServerSideTests.cs

@@ -267,6 +267,30 @@ public void etag_not_match_304_if_none_match()
             Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
         }
 
+        [Test]
+        public void can_handle_ihttpactionresult_with_default_media_type()
+        {
+            var client = new HttpClient(_server);
+            var result = client.GetAsync(_url + "Get_ihttpactionresult").Result;
+
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_ihttpactionresult:application/json; charset=utf-8")), Times.Exactly(2));
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_ihttpactionresult"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), null), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_ihttpactionresult:application/json; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_ihttpactionresult")), Times.Once());
+        }
+
+        [Test]
+        public void can_handle_ihttpactionresult_with_non_default_media_type()
+        {
+            var client = new HttpClient(_server);
+            var req = new HttpRequestMessage(HttpMethod.Get, _url + "Get_ihttpactionresult");
+            req.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/xml"));
+            var result = client.SendAsync(req).Result;
+
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_ihttpactionresult:text/xml; charset=utf-8")), Times.Exactly(2));
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_ihttpactionresult"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), null), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_ihttpactionresult:text/xml; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_ihttpactionresult")), Times.Once());
+        }
+
 
         //[Test]
         //public void must_add_querystring_to_cache_params()

test/WebApi.OutputCache.V2.Tests/TestControllers/SampleController.cs

@@ -146,5 +146,11 @@ public void Post_2_invalidates()
         {
             //do nothing
         }
+
+        [CacheOutput(ClientTimeSpan = 100, ServerTimeSpan = 100)]
+        public IHttpActionResult Get_ihttpactionresult()
+        {
+            return Ok("value");
+        }
     }
 }