From 5c2ac79518d9614e6cbc0e4c3074c8ee6a605f5b Mon Sep 17 00:00:00 2001 From: ByteBlast Date: Tue, 11 Nov 2014 20:53:10 +0000 Subject: [PATCH] Resolves #40. --- .../ControllerResultTest.cs | 20 +++++++++---------- .../ShouldGiveHttpStatus.cs | 2 +- .../ControllerResultTest/ShouldRedirectTo.cs | 18 ++++++++--------- .../ControllerResultTest/ShouldRenderFile.cs | 12 +++++------ .../ControllerResultTest/ShouldRenderView.cs | 12 +++++------ .../ShouldReturnContent.cs | 2 +- .../ControllerResultTest/ShouldReturnJson.cs | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs index bb3ee35..3961af6 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs @@ -4,30 +4,30 @@ namespace TestStack.FluentMVCTesting { public partial class ControllerResultTest where T : Controller { - private readonly T _controller; - private readonly string _actionName; - private readonly ActionResult _actionResult; + public T Controller { get; private set; } + public string ActionName { get; private set; } + public ActionResult ActionResult { get; private set; } - private void ValidateActionReturnType() where TActionResult : ActionResult + public void ValidateActionReturnType() where TActionResult : ActionResult { - var castedActionResult = _actionResult as TActionResult; + var castedActionResult = ActionResult as TActionResult; - if (_actionResult == null) + if (ActionResult == null) throw new ActionResultAssertionException(string.Format("Received null action result when expecting {0}.", typeof(TActionResult).Name)); if (castedActionResult == null) throw new ActionResultAssertionException( string.Format("Expected action result to be a {0}, but instead received a {1}.", - typeof(TActionResult).Name, _actionResult.GetType().Name + typeof(TActionResult).Name, ActionResult.GetType().Name ) ); } public ControllerResultTest(T controller, string actionName, ActionResult actionResult) { - _controller = controller; - _actionName = actionName; - _actionResult = actionResult; + Controller = controller; + ActionName = actionName; + ActionResult = actionResult; } } } \ No newline at end of file diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs index b29acad..bf0c37f 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs @@ -14,7 +14,7 @@ public void ShouldGiveHttpStatus(int status) { ValidateActionReturnType(); - var statusCodeResult = (HttpStatusCodeResult)_actionResult; + var statusCodeResult = (HttpStatusCodeResult)ActionResult; if (statusCodeResult.StatusCode != status) throw new ActionResultAssertionException(string.Format("Expected HTTP status code to be '{0}', but instead received a '{1}'.", status, statusCodeResult.StatusCode)); diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs index 0e8899f..e435197 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs @@ -12,7 +12,7 @@ public partial class ControllerResultTest public void ShouldRedirectTo(string url) { ValidateActionReturnType(); - var redirectResult = (RedirectResult)_actionResult; + var redirectResult = (RedirectResult)ActionResult; if (redirectResult.Url != url) throw new ActionResultAssertionException(string.Format("Expected redirect to URL '{0}', but instead was given a redirect to URL '{1}'.", url, redirectResult.Url)); @@ -21,7 +21,7 @@ public void ShouldRedirectTo(string url) public RouteValueDictionary ShouldRedirectToRoute(string route) { ValidateActionReturnType(); - var redirectResult = (RedirectToRouteResult)_actionResult; + var redirectResult = (RedirectToRouteResult)ActionResult; if (redirectResult.RouteName != route) throw new ActionResultAssertionException(string.Format("Expected redirect to route '{0}', but instead was given a redirect to route '{1}'.", route, redirectResult.RouteName)); @@ -31,27 +31,27 @@ public RouteValueDictionary ShouldRedirectToRoute(string route) public RouteValueDictionary ShouldRedirectTo(Func> actionRedirectedTo) { - return ShouldRedirectTo(actionRedirectedTo(_controller).Method); + return ShouldRedirectTo(actionRedirectedTo(Controller).Method); } public RouteValueDictionary ShouldRedirectTo(Func> actionRedirectedTo) { - return ShouldRedirectTo(actionRedirectedTo(_controller).Method); + return ShouldRedirectTo(actionRedirectedTo(Controller).Method); } public RouteValueDictionary ShouldRedirectTo(Func> actionRedirectedTo) { - return ShouldRedirectTo(actionRedirectedTo(_controller).Method); + return ShouldRedirectTo(actionRedirectedTo(Controller).Method); } public RouteValueDictionary ShouldRedirectTo(Func> actionRedirectedTo) { - return ShouldRedirectTo(actionRedirectedTo(_controller).Method); + return ShouldRedirectTo(actionRedirectedTo(Controller).Method); } public RouteValueDictionary ShouldRedirectTo(Func> actionRedirectedTo) { - return ShouldRedirectTo(actionRedirectedTo(_controller).Method); + return ShouldRedirectTo(actionRedirectedTo(Controller).Method); } public RouteValueDictionary ShouldRedirectTo(Expression> actionRedirectedTo) @@ -66,7 +66,7 @@ public RouteValueDictionary ShouldRedirectTo(MethodInfo method, RouteValueDictio var controllerName = new Regex(@"Controller$").Replace(typeof(T).Name, ""); var actionName = method.Name; - var redirectResult = (RedirectToRouteResult)_actionResult; + var redirectResult = (RedirectToRouteResult)ActionResult; if (redirectResult.RouteValues.ContainsKey("Controller") && redirectResult.RouteValues["Controller"].ToString() != controllerName) throw new ActionResultAssertionException(string.Format("Expected redirect to controller '{0}', but instead was given a redirect to controller '{1}'.", controllerName, redirectResult.RouteValues["Controller"])); @@ -114,7 +114,7 @@ public RouteValueDictionary ShouldRedirectTo(MethodInfo methodInfo) var controllerName = new Regex(@"Controller$").Replace(typeof(TController).Name, ""); var actionName = methodInfo.Name; - var redirectResult = (RedirectToRouteResult)_actionResult; + var redirectResult = (RedirectToRouteResult)ActionResult; if (redirectResult.RouteValues["Controller"] == null) throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}' in '{1}' controller, but instead was given redirect to action '{2}' within the same controller.", actionName, controllerName, redirectResult.RouteValues["Action"])); diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs index 1db0626..b12207b 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs @@ -30,7 +30,7 @@ private static byte[] ConvertStreamToArray(Stream stream) public FileResult ShouldRenderAnyFile(string contentType = null) { ValidateActionReturnType(); - var fileResult = (FileResult)_actionResult; + var fileResult = (FileResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); @@ -40,7 +40,7 @@ public FileResult ShouldRenderAnyFile(string contentType = null) public FileContentResult ShouldRenderFileContents(byte[] contents = null, string contentType = null) { ValidateActionReturnType(); - var fileResult = (FileContentResult)_actionResult; + var fileResult = (FileContentResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); @@ -58,7 +58,7 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string public FileContentResult ShouldRenderFileContents(string contents, string contentType = null, Encoding encoding = null) { ValidateActionReturnType(); - var fileResult = (FileContentResult)_actionResult; + var fileResult = (FileContentResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); @@ -86,7 +86,7 @@ public FileStreamResult ShouldRenderFileStream(byte[] content, string contentTyp public FileStreamResult ShouldRenderFileStream(Stream stream = null, string contentType = null) { ValidateActionReturnType(); - var fileResult = (FileStreamResult)_actionResult; + var fileResult = (FileStreamResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); @@ -110,7 +110,7 @@ public FileStreamResult ShouldRenderFileStream(Stream stream = null, string cont public FileStreamResult ShouldRenderFileStream(string contents, string contentType = null, Encoding encoding = null) { ValidateActionReturnType(); - var fileResult = (FileStreamResult)_actionResult; + var fileResult = (FileStreamResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); @@ -132,7 +132,7 @@ public FileStreamResult ShouldRenderFileStream(string contents, string contentTy public FilePathResult ShouldRenderFilePath(string fileName = null, string contentType = null) { ValidateActionReturnType(); - var fileResult = (FilePathResult)_actionResult; + var fileResult = (FilePathResult)ActionResult; EnsureContentTypeIsSame(fileResult.ContentType, contentType); diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs index ee8188f..b417095 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs @@ -8,14 +8,14 @@ private ViewResultTest ShouldRenderViewResult(string viewName) wher { ValidateActionReturnType(); - var viewResult = (TViewResult)_actionResult; + var viewResult = (TViewResult)ActionResult; - if (viewResult.ViewName != viewName && (viewName != _actionName || viewResult.ViewName != "")) + if (viewResult.ViewName != viewName && (viewName != ActionName || viewResult.ViewName != "")) { - throw new ActionResultAssertionException(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", viewName, viewResult.ViewName == "" ? _actionName : viewResult.ViewName)); + throw new ActionResultAssertionException(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", viewName, viewResult.ViewName == "" ? ActionName : viewResult.ViewName)); } - return new ViewResultTest(viewResult, _controller); + return new ViewResultTest(viewResult, Controller); } public ViewResultTest ShouldRenderView(string viewName) @@ -30,12 +30,12 @@ public ViewResultTest ShouldRenderPartialView(string viewName) public ViewResultTest ShouldRenderDefaultView() { - return ShouldRenderView(_actionName); + return ShouldRenderView(ActionName); } public ViewResultTest ShouldRenderDefaultPartialView() { - return ShouldRenderPartialView(_actionName); + return ShouldRenderPartialView(ActionName); } } } \ No newline at end of file diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs index 0d38e05..a8f365e 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs @@ -8,7 +8,7 @@ public partial class ControllerResultTest public ContentResult ShouldReturnContent(string content = null, string contentType = null, Encoding encoding = null) { ValidateActionReturnType(); - var contentResult = (ContentResult)_actionResult; + var contentResult = (ContentResult)ActionResult; if (contentType != null && contentType != contentResult.ContentType) { diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs index acd1139..67dcb6d 100644 --- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs +++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs @@ -13,7 +13,7 @@ public void ShouldReturnJson() public void ShouldReturnJson(Action assertion) { ValidateActionReturnType(); - var jsonResult = (JsonResult)_actionResult; + var jsonResult = (JsonResult)ActionResult; assertion(jsonResult.Data); } }