Skip to content

Commit 5c2ac79

Browse files
AlexArchiveAlexArchive
committed
Resolves #40.
1 parent fd72d54 commit 5c2ac79

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ namespace TestStack.FluentMVCTesting
44
{
55
public partial class ControllerResultTest<T> where T : Controller
66
{
7-
private readonly T _controller;
8-
private readonly string _actionName;
9-
private readonly ActionResult _actionResult;
7+
public T Controller { get; private set; }
8+
public string ActionName { get; private set; }
9+
public ActionResult ActionResult { get; private set; }
1010

11-
private void ValidateActionReturnType<TActionResult>() where TActionResult : ActionResult
11+
public void ValidateActionReturnType<TActionResult>() where TActionResult : ActionResult
1212
{
13-
var castedActionResult = _actionResult as TActionResult;
13+
var castedActionResult = ActionResult as TActionResult;
1414

15-
if (_actionResult == null)
15+
if (ActionResult == null)
1616
throw new ActionResultAssertionException(string.Format("Received null action result when expecting {0}.", typeof(TActionResult).Name));
1717

1818
if (castedActionResult == null)
1919
throw new ActionResultAssertionException(
2020
string.Format("Expected action result to be a {0}, but instead received a {1}.",
21-
typeof(TActionResult).Name, _actionResult.GetType().Name
21+
typeof(TActionResult).Name, ActionResult.GetType().Name
2222
)
2323
);
2424
}
2525

2626
public ControllerResultTest(T controller, string actionName, ActionResult actionResult)
2727
{
28-
_controller = controller;
29-
_actionName = actionName;
30-
_actionResult = actionResult;
28+
Controller = controller;
29+
ActionName = actionName;
30+
ActionResult = actionResult;
3131
}
3232
}
3333
}

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void ShouldGiveHttpStatus(int status)
1414
{
1515
ValidateActionReturnType<HttpStatusCodeResult>();
1616

17-
var statusCodeResult = (HttpStatusCodeResult)_actionResult;
17+
var statusCodeResult = (HttpStatusCodeResult)ActionResult;
1818

1919
if (statusCodeResult.StatusCode != status)
2020
throw new ActionResultAssertionException(string.Format("Expected HTTP status code to be '{0}', but instead received a '{1}'.", status, statusCodeResult.StatusCode));

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public partial class ControllerResultTest<T>
1212
public void ShouldRedirectTo(string url)
1313
{
1414
ValidateActionReturnType<RedirectResult>();
15-
var redirectResult = (RedirectResult)_actionResult;
15+
var redirectResult = (RedirectResult)ActionResult;
1616

1717
if (redirectResult.Url != url)
1818
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)
2121
public RouteValueDictionary ShouldRedirectToRoute(string route)
2222
{
2323
ValidateActionReturnType<RedirectToRouteResult>();
24-
var redirectResult = (RedirectToRouteResult)_actionResult;
24+
var redirectResult = (RedirectToRouteResult)ActionResult;
2525

2626
if (redirectResult.RouteName != route)
2727
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)
3131

3232
public RouteValueDictionary ShouldRedirectTo(Func<T, Func<ActionResult>> actionRedirectedTo)
3333
{
34-
return ShouldRedirectTo(actionRedirectedTo(_controller).Method);
34+
return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
3535
}
3636

3737
public RouteValueDictionary ShouldRedirectTo(Func<T, Func<int, ActionResult>> actionRedirectedTo)
3838
{
39-
return ShouldRedirectTo(actionRedirectedTo(_controller).Method);
39+
return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
4040
}
4141

4242
public RouteValueDictionary ShouldRedirectTo<T1>(Func<T, Func<T1, ActionResult>> actionRedirectedTo)
4343
{
44-
return ShouldRedirectTo(actionRedirectedTo(_controller).Method);
44+
return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
4545
}
4646

4747
public RouteValueDictionary ShouldRedirectTo<T1, T2>(Func<T, Func<T1, T2, ActionResult>> actionRedirectedTo)
4848
{
49-
return ShouldRedirectTo(actionRedirectedTo(_controller).Method);
49+
return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
5050
}
5151

5252
public RouteValueDictionary ShouldRedirectTo<T1, T2, T3>(Func<T, Func<T1, T2, T3, ActionResult>> actionRedirectedTo)
5353
{
54-
return ShouldRedirectTo(actionRedirectedTo(_controller).Method);
54+
return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
5555
}
5656

5757
public RouteValueDictionary ShouldRedirectTo(Expression<Action<T>> actionRedirectedTo)
@@ -66,7 +66,7 @@ public RouteValueDictionary ShouldRedirectTo(MethodInfo method, RouteValueDictio
6666

6767
var controllerName = new Regex(@"Controller$").Replace(typeof(T).Name, "");
6868
var actionName = method.Name;
69-
var redirectResult = (RedirectToRouteResult)_actionResult;
69+
var redirectResult = (RedirectToRouteResult)ActionResult;
7070

7171
if (redirectResult.RouteValues.ContainsKey("Controller") && redirectResult.RouteValues["Controller"].ToString() != controllerName)
7272
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<TController>(MethodInfo methodInfo)
114114
var controllerName = new Regex(@"Controller$").Replace(typeof(TController).Name, "");
115115
var actionName = methodInfo.Name;
116116

117-
var redirectResult = (RedirectToRouteResult)_actionResult;
117+
var redirectResult = (RedirectToRouteResult)ActionResult;
118118

119119
if (redirectResult.RouteValues["Controller"] == null)
120120
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"]));

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private static byte[] ConvertStreamToArray(Stream stream)
3030
public FileResult ShouldRenderAnyFile(string contentType = null)
3131
{
3232
ValidateActionReturnType<FileResult>();
33-
var fileResult = (FileResult)_actionResult;
33+
var fileResult = (FileResult)ActionResult;
3434

3535
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
3636

@@ -40,7 +40,7 @@ public FileResult ShouldRenderAnyFile(string contentType = null)
4040
public FileContentResult ShouldRenderFileContents(byte[] contents = null, string contentType = null)
4141
{
4242
ValidateActionReturnType<FileContentResult>();
43-
var fileResult = (FileContentResult)_actionResult;
43+
var fileResult = (FileContentResult)ActionResult;
4444

4545
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
4646

@@ -58,7 +58,7 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string
5858
public FileContentResult ShouldRenderFileContents(string contents, string contentType = null, Encoding encoding = null)
5959
{
6060
ValidateActionReturnType<FileContentResult>();
61-
var fileResult = (FileContentResult)_actionResult;
61+
var fileResult = (FileContentResult)ActionResult;
6262

6363
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
6464

@@ -86,7 +86,7 @@ public FileStreamResult ShouldRenderFileStream(byte[] content, string contentTyp
8686
public FileStreamResult ShouldRenderFileStream(Stream stream = null, string contentType = null)
8787
{
8888
ValidateActionReturnType<FileStreamResult>();
89-
var fileResult = (FileStreamResult)_actionResult;
89+
var fileResult = (FileStreamResult)ActionResult;
9090

9191
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
9292

@@ -110,7 +110,7 @@ public FileStreamResult ShouldRenderFileStream(Stream stream = null, string cont
110110
public FileStreamResult ShouldRenderFileStream(string contents, string contentType = null, Encoding encoding = null)
111111
{
112112
ValidateActionReturnType<FileStreamResult>();
113-
var fileResult = (FileStreamResult)_actionResult;
113+
var fileResult = (FileStreamResult)ActionResult;
114114

115115
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
116116

@@ -132,7 +132,7 @@ public FileStreamResult ShouldRenderFileStream(string contents, string contentTy
132132
public FilePathResult ShouldRenderFilePath(string fileName = null, string contentType = null)
133133
{
134134
ValidateActionReturnType<FilePathResult>();
135-
var fileResult = (FilePathResult)_actionResult;
135+
var fileResult = (FilePathResult)ActionResult;
136136

137137
EnsureContentTypeIsSame(fileResult.ContentType, contentType);
138138

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ private ViewResultTest ShouldRenderViewResult<TViewResult>(string viewName) wher
88
{
99
ValidateActionReturnType<TViewResult>();
1010

11-
var viewResult = (TViewResult)_actionResult;
11+
var viewResult = (TViewResult)ActionResult;
1212

13-
if (viewResult.ViewName != viewName && (viewName != _actionName || viewResult.ViewName != ""))
13+
if (viewResult.ViewName != viewName && (viewName != ActionName || viewResult.ViewName != ""))
1414
{
15-
throw new ActionResultAssertionException(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", viewName, viewResult.ViewName == "" ? _actionName : viewResult.ViewName));
15+
throw new ActionResultAssertionException(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", viewName, viewResult.ViewName == "" ? ActionName : viewResult.ViewName));
1616
}
1717

18-
return new ViewResultTest(viewResult, _controller);
18+
return new ViewResultTest(viewResult, Controller);
1919
}
2020

2121
public ViewResultTest ShouldRenderView(string viewName)
@@ -30,12 +30,12 @@ public ViewResultTest ShouldRenderPartialView(string viewName)
3030

3131
public ViewResultTest ShouldRenderDefaultView()
3232
{
33-
return ShouldRenderView(_actionName);
33+
return ShouldRenderView(ActionName);
3434
}
3535

3636
public ViewResultTest ShouldRenderDefaultPartialView()
3737
{
38-
return ShouldRenderPartialView(_actionName);
38+
return ShouldRenderPartialView(ActionName);
3939
}
4040
}
4141
}

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class ControllerResultTest<T>
88
public ContentResult ShouldReturnContent(string content = null, string contentType = null, Encoding encoding = null)
99
{
1010
ValidateActionReturnType<ContentResult>();
11-
var contentResult = (ContentResult)_actionResult;
11+
var contentResult = (ContentResult)ActionResult;
1212

1313
if (contentType != null && contentType != contentResult.ContentType)
1414
{

‎TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void ShouldReturnJson()
1313
public void ShouldReturnJson(Action<dynamic> assertion)
1414
{
1515
ValidateActionReturnType<JsonResult>();
16-
var jsonResult = (JsonResult)_actionResult;
16+
var jsonResult = (JsonResult)ActionResult;
1717
assertion(jsonResult.Data);
1818
}
1919
}

0 commit comments

Comments
 (0)