huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing build break due to tests

This commit is contained in:
harshgMSFT 2014-08-15 10:28:11 -07:00
parent fa6b3acc4a
commit 3f952c153f
4 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Mvc.Core/Formatters/NoContentFormatter.cs
View File

@ -24,11 +24,9 @@ namespace Microsoft.AspNet.Mvc
response.ContentLength = 0; response.ContentLength = 0;
// Only set the status code if its not already set. // Only set the status code if its not already set.
if (response.StatusCode == 0) // TODO: By default the status code is set to 200.
{ // https://github.com/aspnet/HttpAbstractions/issues/114
response.StatusCode = 204; response.StatusCode = 204;
}
return Task.FromResult<bool>(true); return Task.FromResult<bool>(true);
} }
} }

26
test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
View File

@ -61,13 +61,10 @@ namespace Microsoft.AspNet.Mvc.Test
} }
[Fact] [Fact]
public async Task WriteAsync_WritesTheStatusCode204_IfNotAlreadySet() public async Task WriteAsync_WritesTheStatusCode204()
{ {
// Arrange // Arrange
var defaultHttpContext = new DefaultHttpContext(); var defaultHttpContext = new DefaultHttpContext();
// Workaround for https://github.com/aspnet/HttpAbstractions/issues/114
defaultHttpContext.Response.StatusCode = 0;
var formatterContext = new OutputFormatterContext() var formatterContext = new OutputFormatterContext()
{ {
Object = null, Object = null,
@ -82,26 +79,5 @@ namespace Microsoft.AspNet.Mvc.Test
// Assert // Assert
Assert.Equal(204, defaultHttpContext.Response.StatusCode); Assert.Equal(204, defaultHttpContext.Response.StatusCode);
} }
[Fact]
public async Task WriteAsync_DoesnNotWriteTheStatusCode204_IfStatusCodeIsSetAlready()
{
// Arrange
var defaultHttpContext = new DefaultHttpContext();
defaultHttpContext.Response.StatusCode = 201;
var formatterContext = new OutputFormatterContext()
{
Object = null,
ActionContext = new ActionContext(defaultHttpContext, new RouteData(), new ActionDescriptor())
};
var formatter = new NoContentFormatter();
// Act
await formatter.WriteAsync(formatterContext);
// Assert
Assert.Equal(201, defaultHttpContext.Response.StatusCode);
}
} }
} }

1
test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormattterTests.cs
View File

@ -58,7 +58,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
[Theory] [Theory]
[InlineData("ReturnTaskOfString_NullValue")] [InlineData("ReturnTaskOfString_NullValue")]
[InlineData("ReturnTaskOfObject_StringValue")]
[InlineData("ReturnTaskOfObject_NullValue")] [InlineData("ReturnTaskOfObject_NullValue")]
[InlineData("ReturnObject_NullValue")] [InlineData("ReturnObject_NullValue")]
public async Task NoContentFormatter_ForNullValue_GetsSelectedAndWritesResponse(string actionName) public async Task NoContentFormatter_ForNullValue_GetsSelectedAndWritesResponse(string actionName)

7
test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs
View File

@ -73,9 +73,10 @@ namespace Microsoft.AspNet.Mvc
setup.Setup(mvcOptions); setup.Setup(mvcOptions);
// Assert // Assert
Assert.Equal(2, mvcOptions.OutputFormatters.Count); Assert.Equal(3, mvcOptions.OutputFormatters.Count);
Assert.IsType<TextPlainFormatter>(mvcOptions.OutputFormatters[0].Instance); Assert.IsType<NoContentFormatter>(mvcOptions.OutputFormatters[0].Instance);
Assert.IsType<JsonOutputFormatter>(mvcOptions.OutputFormatters[1].Instance); Assert.IsType<TextPlainFormatter>(mvcOptions.OutputFormatters[1].Instance);
Assert.IsType<JsonOutputFormatter>(mvcOptions.OutputFormatters[2].Instance);
} }
} }
} }