Fix byte array logic, content-type, and add tests

Author: Christopher Anderson

src/WebJobs.Script/Binding/Http/RawScriptResult.cs

@@ -4,15 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Azure.WebJobs.Script.WebHost.Formatters;
-using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
@@ -80,7 +78,7 @@ private async Task WriteResponseBodyAsync(HttpResponse response, object content)
 
             IOutputFormatter selectedFormatter = SelectedFormatter(formatterContext);
 
-            if (selectedFormatter != null)
+            if (selectedFormatter == null)
             {
                 // We were unable to locate a formatter with the provided type, to maintain the original behavior
                 // we'll convert the object to string and get a formatter
@@ -90,6 +88,8 @@ private async Task WriteResponseBodyAsync(HttpResponse response, object content)
                 selectedFormatter = SelectedFormatter(formatterContext);
             }
 
+            formatterContext.ContentType = response.ContentType;
+
             await selectedFormatter.WriteAsync(formatterContext);
         }
 
@@ -101,8 +101,6 @@ private static OutputFormatterWriteContext CreateFormatterContext(HttpResponse r
                 content?.GetType(),
                 content);
 
-            context.ContentType = response.ContentType;
-
             return context;
         }
 

test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs

@@ -2,13 +2,11 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Features;
-using Moq;
+using System.Threading.Tasks;
 
 namespace Microsoft.WebJobs.Script.Tests
 {

test/WebJobs.Script.Tests.Shared/TestHelpers.cs

@@ -234,5 +234,15 @@ private static async Task<string[]> ReadAllLinesSafeAsync(string logFile)
 
             return logs;
         }
+
+
+        public static async Task<string> ReadStreamToEnd(Stream stream)
+        {
+            stream.Position = 0;
+            using (var sr = new StreamReader(stream))
+            {
+                return await sr.ReadToEndAsync();
+            }
+        }
     }
 }

test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs

@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs.Script.Binding;
+using Microsoft.Extensions.Primitives;
+using Microsoft.WebJobs.Script.Tests;
+using Xunit;
+
+namespace Microsoft.Azure.WebJobs.Script.Tests.Binding.ActionResults
+{
+    public class RawScriptResultTests
+    {
+        [Fact]
+        public void HasExpectedProperties_WithStatusCode()
+        {
+            var obj = "hello world";
+            var result = new RawScriptResult(202, obj) { Headers = new Dictionary<string, object>() };
+
+            Assert.Equal(202, result.StatusCode);
+            Assert.Equal(obj, result.Content);
+            Assert.Empty(result.Headers);
+        }
+
+        [Fact]
+        public void HasExpectedProperties_WithoutStatusCode()
+        {
+            var obj = "hello world";
+            var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
+
+            Assert.Null(result.StatusCode);
+            Assert.Equal(obj, result.Content);
+            Assert.Empty(result.Headers);
+        }
+
+        [Fact]
+        public async Task HandlesStringContent()
+        {
+            var obj = "{ \"a\": 1 }";
+            var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
+            var context = new ActionContext() { HttpContext = new DefaultHttpContext() };
+            context.HttpContext.Response.Body = new MemoryStream();
+            await result.ExecuteResultAsync(context);
+            var body = await TestHelpers.ReadStreamToEnd(context.HttpContext.Response.Body);
+            Assert.Equal(obj, body);
+            Assert.Equal(200, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task HandlesStringContent_WithHeader()
+        {
+            var obj = "{ \"a\": 1 }";
+            var contentHeader = "application/json";
+            var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
+            var context = new ActionContext() { HttpContext = new DefaultHttpContext() };
+            context.HttpContext.Response.Headers.Add("Content-Type", contentHeader);
+            context.HttpContext.Response.Body = new MemoryStream();
+            await result.ExecuteResultAsync(context);
+            var body = await TestHelpers.ReadStreamToEnd(context.HttpContext.Response.Body);
+            StringValues value;
+            Assert.True(context.HttpContext.Response.Headers.TryGetValue("Content-Type", out value));
+            Assert.Equal("application/json; charset=utf-8", value);
+            Assert.Equal(obj, body);
+            Assert.Equal(200, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task HandlesByteContent()
+        {
+            var content = "{ \"a\": 1 }";
+            var obj = Encoding.UTF8.GetBytes(content);
+            var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
+            var context = new ActionContext() { HttpContext = new DefaultHttpContext() };
+            context.HttpContext.Response.Body = new MemoryStream();
+            await result.ExecuteResultAsync(context);
+            var body = await TestHelpers.ReadStreamToEnd(context.HttpContext.Response.Body);
+            Assert.Equal(content, body);
+            Assert.Equal(200, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task HandlesStreamContent()
+        {
+            var content = "{ \"a\": 1 }";
+            var obj = new MemoryStream(Encoding.UTF8.GetBytes(content));
+            var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
+            var context = new ActionContext() { HttpContext = new DefaultHttpContext() };
+            context.HttpContext.Response.Body = new MemoryStream();
+            await result.ExecuteResultAsync(context);
+            var body = await TestHelpers.ReadStreamToEnd(context.HttpContext.Response.Body);
+            Assert.Equal(content, body);
+            Assert.Equal(200, context.HttpContext.Response.StatusCode);
+        }
+    }
+}