Skip to content
This repository has been archived by the owner on Dec 14, 2018. It is now read-only.

Commit

Permalink
Add StatusCode helpers to ControllerBase
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanbrandenburg committed Mar 21, 2016
1 parent 8e6b498 commit a78f77a
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 1 deletion.
27 changes: 26 additions & 1 deletion src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,32 @@ public ClaimsPrincipal User
}
}

/// <summary>
/// Creates a <see cref="StatusCodeResult"/> object by specifying a <paramref name="statusCode"/>.
/// </summary>
/// <param name="statusCode">The status code to set on the response.</param>
/// <returns>The created <see cref="StatusCodeResult"/> object for the response.</returns>
[NonAction]
public virtual StatusCodeResult StatusCode(int statusCode)
{
return new StatusCodeResult(statusCode);
}

/// <summary>
/// Creates a <see cref="ObjectResult"/> object by specifying a <paramref name="statusCode"/> and <paramref name="value"/>
/// </summary>
/// <param name="statusCode">The status code to set on the response.</param>
/// <param name="value">The value to set on the <see cref="ObjectResult"/>.</param>
/// <returns>The created <see cref="ObjectResult"/> object for the response.</returns>
[NonAction]
public virtual ObjectResult StatusCode(int statusCode, object value)
{
var result = new ObjectResult(value);
result.StatusCode = statusCode;

return result;
}

/// <summary>
/// Creates a <see cref="ContentResult"/> object by specifying a <paramref name="content"/> string.
/// </summary>
Expand Down Expand Up @@ -266,7 +292,6 @@ public virtual ContentResult Content(string content, MediaTypeHeaderValue conten
return result;
}


/// <summary>
/// Creates a <see cref="NoContentResult"/> object that produces an empty No Content (204) response.
/// </summary>
Expand Down
61 changes: 61 additions & 0 deletions test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,54 @@ public void Controller_Content_CharsetInContentType_IsUsedForEncoding()
Assert.Equal(contentType, contentResult.ContentType);
}

[Fact]
public void Controller_StatusCode_SetObject()
{
// Arrange
var statusCode = 204;
var value = new { Value = 42 };

var statusCodeController = new StatusCodeController();

// Act
var result = (ObjectResult)statusCodeController.StatusCode_Object(statusCode, value);

// Assert
Assert.Equal(statusCode, result.StatusCode);
Assert.Equal(value, result.Value);
}

[Fact]
public void Controller_StatusCode_SetObjectNull()
{
// Arrange
var statusCode = 204;
object value = null;

var statusCodeController = new StatusCodeController();

// Act
var result = statusCodeController.StatusCode_Object(statusCode, value);

// Assert
Assert.Equal(statusCode, result.StatusCode);
Assert.Equal(value, result.Value);
}

[Fact]
public void Controller_StatusCode_SetsStatusCode()
{
// Arrange
var statusCode = 205;
var statusCodeController = new StatusCodeController();

// Act
var result = statusCodeController.StatusCode_Int(statusCode);

// Assert
Assert.Equal(statusCode, result.StatusCode);
}

public static IEnumerable<object[]> RedirectTestData
{
get
Expand Down Expand Up @@ -1640,6 +1688,19 @@ public void Dispose()
}
}

private class StatusCodeController : ControllerBase
{
public StatusCodeResult StatusCode_Int(int statusCode)
{
return StatusCode(statusCode);
}

public ObjectResult StatusCode_Object(int statusCode, object value)
{
return StatusCode(statusCode, value);
}
}

private class ContentController : ControllerBase
{
public IActionResult Content_WithNoEncoding()
Expand Down

0 comments on commit a78f77a

Please sign in to comment.