Skip to content

Commit e621d1a

Browse files
faddivfaddiv
committed
Fix ActionResultAssertions tests. Change returning fail messages. Extract Reason args everywhere.
1 parent 7a6a041 commit e621d1a

15 files changed

+265
-393
lines changed

‎src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertions.cs‎

Lines changed: 71 additions & 291 deletions
Large diffs are not rendered by default.

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/ActionResultAssertions_Tests.cs‎

Lines changed: 112 additions & 46 deletions
Large diffs are not rendered by default.

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/ContentResultAssertions_Tests.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
88

99
public class ContentResultAssertions_Tests
1010
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1114
[Fact]
1215
public void WithContent_GivenExpected_ShouldPass()
1316
{
@@ -23,7 +26,7 @@ public void WithContent_GivenUnexpected_ShouldFail()
2326
ActionResult result = new ContentResult { Content = actualContent };
2427
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("ContentResult.Content", expectedContent, actualContent);
2528

26-
Action a = () => result.Should().BeContentResult().WithContent(expectedContent, "it is {0}", 10);
29+
Action a = () => result.Should().BeContentResult().WithContent(expectedContent, Reason, ReasonArgs);
2730

2831
a.Should().Throw<Exception>()
2932
.WithMessage(failureMessage);
@@ -44,7 +47,7 @@ public void WithContentType_GivenUnexpected_ShouldFail()
4447
ActionResult result = new ContentResult { ContentType = actualContentType };
4548
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("ContentResult.ContentType", expectedContentType, actualContentType);
4649

47-
Action a = () => result.Should().BeContentResult().WithContentType(expectedContentType, "it is {0}", 10);
50+
Action a = () => result.Should().BeContentResult().WithContentType(expectedContentType, Reason, ReasonArgs);
4851

4952
a.Should().Throw<Exception>()
5053
.WithMessage(failureMessage);

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/CreatedResultAssertions_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class CreatedResultAssertions_Tests
1414
private const string TestUriAsString = "http://localhost:5000";
1515
private const string TestWrongUriAsString = "http://somedomain.com:5000";
1616

17-
private Uri TestUri = new Uri(TestUriAsString);
18-
private Uri TestWrongUri = new Uri(TestWrongUriAsString);
17+
private readonly Uri TestUri = new Uri(TestUriAsString);
18+
private readonly Uri TestWrongUri = new Uri(TestWrongUriAsString);
1919

2020
[Fact]
2121
public void Value_GivenExpectedValue_ShouldPass()

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/FileContentResultAssertions_Tests.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using FluentAssertions.AspNetCore.Mvc.Tests.Helpers;
2+
using FluentAssertions.Mvc.Tests.Helpers;
23
using Microsoft.AspNetCore.Mvc;
34
using System;
45
using Xunit;
@@ -7,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
78
{
89
public class FileContentResultAssertions_Tests
910
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1014
[Fact]
1115
public void WithFileContents_GivenExpectedValue_ShouldPass()
1216
{
@@ -35,7 +39,7 @@ public void WithFileContents_GivenUnexpectedValue_ShouldFail(
3539

3640
Action a = () => result.Should()
3741
.BeFileContentResult()
38-
.WithFileContents(expectedBytes, "it is {0}", 10);
42+
.WithFileContents(expectedBytes, Reason, ReasonArgs);
3943

4044
a.Should().Throw<Exception>()
4145
.WithMessage(failureMessage);

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/FileResultAssertions_Tests.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
99
{
1010
public class FileResultAssertions_Tests
1111
{
12+
public const string Reason = FailureMessageHelper.Reason;
13+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
14+
1215
[Fact]
1316
public void WithContentType_GivenExpectedValue_ShouldPass()
1417
{
@@ -27,7 +30,7 @@ public void WithContentType_GivenUnexpected_ShouldFail()
2730
ActionResult result = TestDataGenerator.CreateFileContentResult(contentType: actualValue);
2831
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("FileResult.ContentType", expectedValue, actualValue);
2932

30-
Action a = () => result.Should().BeFileResult().WithContentType(expectedValue, "it is {0}", 10);
33+
Action a = () => result.Should().BeFileResult().WithContentType(expectedValue, Reason, ReasonArgs);
3134

3235
a.Should().Throw<Exception>()
3336
.WithMessage(failureMessage);
@@ -51,7 +54,7 @@ public void WithFileDownloadName_GivenUnexpected_ShouldFail()
5154
result.FileDownloadName = actualValue;
5255
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("FileResult.FileDownloadName", expectedValue, actualValue);
5356

54-
Action a = () => result.Should().BeFileResult().WithFileDownloadName(expectedValue, "it is {0}", 10);
57+
Action a = () => result.Should().BeFileResult().WithFileDownloadName(expectedValue, Reason, ReasonArgs);
5558

5659
a.Should().Throw<Exception>()
5760
.WithMessage(failureMessage);
@@ -82,7 +85,7 @@ public void WithLastModified_GivenUnexpected_ShouldFail(
8285
result.LastModified = actualValue;
8386
var failureMessage = $"Expected FileResult.LastModified to be <{expected ?? "null"}> because it is 10 but found <{actual ?? "null"}>.";
8487

85-
Action a = () => result.Should().BeFileResult().WithLastModified(expectedValue, "it is {0}", 10);
88+
Action a = () => result.Should().BeFileResult().WithLastModified(expectedValue, Reason, ReasonArgs);
8689

8790
a.Should().Throw<Exception>()
8891
.WithMessage(failureMessage);
@@ -109,7 +112,7 @@ public void WithEntityTag_GivenUnexpected_ShouldFail()
109112
result.EntityTag = actualEntityTag;
110113
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("FileResult.EntityTag", expectedEntityTag, actualEntityTag);
111114

112-
Action a = () => result.Should().BeFileResult().WithEntityTag(expectedEntityTag, "it is {0}", 10);
115+
Action a = () => result.Should().BeFileResult().WithEntityTag(expectedEntityTag, Reason, ReasonArgs);
113116

114117
a.Should().Throw<Exception>()
115118
.WithMessage(failureMessage);

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/JsonResultAssertions_Tests.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
88
{
99
public class JsonResultAssertions_Tests
1010
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1114
[Fact]
1215
public void WithContentType_GivenExpectedValue_ShouldPass()
1316
{
@@ -30,7 +33,7 @@ public void WithContentType_GivenUnexpected_ShouldFail()
3033
};
3134
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("JsonResult.ContentType", expectedValue, actualValue);
3235

33-
Action a = () => result.Should().BeJsonResult().WithContentType(expectedValue, "it is {0}", 10);
36+
Action a = () => result.Should().BeJsonResult().WithContentType(expectedValue, Reason, ReasonArgs);
3437

3538
a.Should().Throw<Exception>()
3639
.WithMessage(failureMessage);
@@ -58,7 +61,7 @@ public void WithStatusCode_GivenUnexpected_ShouldFail()
5861
};
5962
var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("JsonResult.StatusCode", expectedStatusCode, actualStatusCode);
6063

61-
Action a = () => result.Should().BeJsonResult().WithStatusCode(expectedStatusCode, "it is {0}", 10);
64+
Action a = () => result.Should().BeJsonResult().WithStatusCode(expectedStatusCode, Reason, ReasonArgs);
6265

6366
a.Should().Throw<Exception>()
6467
.WithMessage(failureMessage);

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/PartialViewResultAssertions_Tests.cs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
88

99
public class PartialViewResultAssertions_Tests
1010
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1114
[Fact]
1215
public void WithDefaultViewName_GivenExpectedValue_ShouldPass()
1316
{
@@ -28,7 +31,7 @@ public void WithDefaultViewName_GivenUnexpectedValue_ShouldFail()
2831
};
2932
var failureMessage = "Expected default view because it is 10, but view \"Something\" was rendered.";
3033

31-
Action action = () => result.Should().BePartialViewResult().WithDefaultViewName("it is {0}", 10);
34+
Action action = () => result.Should().BePartialViewResult().WithDefaultViewName(Reason, ReasonArgs);
3235

3336
action.Should()
3437
.Throw<Exception>()
@@ -97,7 +100,7 @@ public void WithViewName_GivenUnexpectedValue_ShouldFail()
97100
ViewName = actual
98101
};
99102

100-
Action action = () => result.Should().BePartialViewResult().WithViewName(expected, "it is {0}", 10);
103+
Action action = () => result.Should().BePartialViewResult().WithViewName(expected, Reason, ReasonArgs);
101104

102105
action.Should().Throw<Exception>()
103106
.WithMessage(failureMessage);
@@ -116,7 +119,7 @@ public void WithTempData_GivenNullTempData_ShouldFail()
116119
{
117120
var result = new PartialViewResult();
118121

119-
Action a = () => result.Should().BePartialViewResult().WithTempData("key1", "value1", "it is {0}", 10);
122+
Action a = () => result.Should().BePartialViewResult().WithTempData("key1", "value1", Reason, ReasonArgs);
120123

121124
a.Should().Throw<Exception>()
122125
.WithMessage("Expected PartialViewResult.TempData to contain value \"value1\" at key \"key1\" because it is 10, but it is <null>."); ;
@@ -127,7 +130,7 @@ public void WithTempData_GivenUnexpectedValue_ShouldFail()
127130
{
128131
var result = new TestController().PartialViewWithOneTempData();
129132

130-
Action a = () => result.Should().BePartialViewResult().WithTempData("key1", "xyz", "it is {0}", 10);
133+
Action a = () => result.Should().BePartialViewResult().WithTempData("key1", "xyz", Reason, ReasonArgs);
131134

132135
a.Should().Throw<Exception>()
133136
.WithMessage("Expected PartialViewResult.TempData to contain value \"xyz\" at key \"key1\" because it is 10 but found \"value1\".");
@@ -138,7 +141,7 @@ public void WithTempData_GivenUnexpectedKey_ShouldFail()
138141
{
139142
var result = new TestController().PartialViewWithOneTempData();
140143

141-
Action a = () => result.Should().BePartialViewResult().WithTempData("xyz", "value1", "it is {0}", 10);
144+
Action a = () => result.Should().BePartialViewResult().WithTempData("xyz", "value1", Reason, ReasonArgs);
142145

143146
a.Should().Throw<Exception>()
144147
.WithMessage("Expected PartialViewResult.TempData to contain value \"value1\" at key \"xyz\" because it is 10, but the key was not found."); ;
@@ -157,7 +160,7 @@ public void WithViewData_GivenNullViewData_ShouldFail()
157160
{
158161
var result = new PartialViewResult();
159162

160-
Action a = () => result.Should().BePartialViewResult().WithViewData("key1", "value1", "it is {0}", 10);
163+
Action a = () => result.Should().BePartialViewResult().WithViewData("key1", "value1", Reason, ReasonArgs);
161164

162165
a.Should().Throw<Exception>()
163166
.WithMessage("Expected PartialViewResult.ViewData to contain value \"value1\" at key \"key1\" because it is 10, but it is <null>.");
@@ -171,7 +174,7 @@ public void WithViewData_GivenUnexpectedValue_ShouldFail()
171174

172175
var result = new TestController().PartialViewWithOneViewData();
173176

174-
Action a = () => result.Should().BePartialViewResult().WithViewData(key, expectedValue, "it is {0}", 10);
177+
Action a = () => result.Should().BePartialViewResult().WithViewData(key, expectedValue, Reason, ReasonArgs);
175178

176179
a.Should().Throw<Exception>()
177180
.WithMessage("Expected PartialViewResult.ViewData to contain value \"abc\" at key \"key1\" because it is 10 but found \"value1\".");
@@ -184,7 +187,7 @@ public void WithViewData_GivenUnexpectedKey_ShouldFail()
184187

185188
var result = new TestController().PartialViewWithOneViewData();
186189

187-
Action a = () => result.Should().BePartialViewResult().WithViewData(expectedKey, "value1", "it is {0}", 10);
190+
Action a = () => result.Should().BePartialViewResult().WithViewData(expectedKey, "value1", Reason, ReasonArgs);
188191

189192
a.Should().Throw<Exception>()
190193
.WithMessage("Expected PartialViewResult.ViewData to contain value \"value1\" at key \"xyz\" because it is 10, but the key was not found.");

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/RedirectResultAssertions_Tests.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
88

99
public class RedirectResultAssertions_Tests
1010
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1114
[Fact]
1215
public void WithUrl_GivenExpectedUrl_ShouldPass()
1316
{
@@ -23,7 +26,7 @@ public void WithUrl_GivenUnexpectedUrl_ShouldFail()
2326
ActionResult result = new RedirectResult("/abc");
2427

2528
Action a = () => result.Should().BeRedirectResult()
26-
.WithUrl("/xyz", "it is {0}", 10);
29+
.WithUrl("/xyz", Reason, ReasonArgs);
2730
a.Should().Throw<Exception>()
2831
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectResult.Url", "/xyz", "/abc"));
2932
}
@@ -43,7 +46,7 @@ public void WithPermanent_GivenUnexpectedUrl_ShouldFail()
4346
ActionResult result = new RedirectResult("/abc", true);
4447

4548
Action a = () => result.Should().BeRedirectResult()
46-
.WithPermanent(false, "it is {0}", 10);
49+
.WithPermanent(false, Reason, ReasonArgs);
4750

4851
a.Should().Throw<Exception>()
4952
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectResult.Permanent", false, true));

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/RedirectToActionResultAssertions_Tests.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
88

99
public class RedirectToActionResultAssertions_Tests
1010
{
11+
public const string Reason = FailureMessageHelper.Reason;
12+
public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
13+
1114
[Fact]
1215
public void WithActionName_GivenExpectedActionName_ShouldPass()
1316
{
@@ -24,7 +27,7 @@ public void WithActionName_GivenUnexpectedActionName_ShouldFail()
2427
RedirectToActionResult result = new RedirectToActionResult("someOtherAction", string.Empty, null);
2528

2629
Action a = () => result.Should().BeRedirectToActionResult()
27-
.WithActionName("expectedAction", "it is {0}", 10);
30+
.WithActionName("expectedAction", Reason, ReasonArgs);
2831

2932
a.Should().Throw<Exception>()
3033
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectToActionResult.ActionName", "expectedAction", "someOtherAction"));
@@ -46,7 +49,7 @@ public void WithControllerName_GivenUnexpectedControllerName_ShouldFail()
4649
RedirectToActionResult result = new RedirectToActionResult(string.Empty, "someOtherController", null);
4750

4851
Action a = () => result.Should().BeRedirectToActionResult()
49-
.WithControllerName("expectedController", "it is {0}", 10);
52+
.WithControllerName("expectedController", Reason, ReasonArgs);
5053

5154
a.Should().Throw<Exception>()
5255
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectToActionResult.ControllerName", "expectedController", "someOtherController"));
@@ -68,7 +71,7 @@ public void WithFragment_GivenUnexpectedFragment_ShouldFail()
6871
RedirectToActionResult result = new RedirectToActionResult(string.Empty, string.Empty, null, false, "someOtherFragment");
6972

7073
Action a = () => result.Should().BeRedirectToActionResult()
71-
.WithFragment("expectedFragment", "it is {0}", 10);
74+
.WithFragment("expectedFragment", Reason, ReasonArgs);
7275

7376
a.Should().Throw<Exception>()
7477
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectToActionResult.Fragment", "expectedFragment", "someOtherFragment"));
@@ -89,7 +92,7 @@ public void WithPermanent_GivenUnexpectedValue_ShouldFail()
8992
RedirectToActionResult result = new RedirectToActionResult(string.Empty, string.Empty, null, true);
9093

9194
Action a = () => result.Should().BeRedirectToActionResult()
92-
.WithPermanent(false, "it is {0}", 10);
95+
.WithPermanent(false, Reason, ReasonArgs);
9396

9497
a.Should().Throw<Exception>()
9598
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectToActionResult.Permanent", false, true));
@@ -110,7 +113,7 @@ public void WithPreserveMethod_GivenUnexpectedValue_ShouldFail()
110113
RedirectToActionResult result = new RedirectToActionResult(string.Empty, string.Empty, null, false, true);
111114

112115
Action a = () => result.Should().BeRedirectToActionResult()
113-
.WithPreserveMethod(false, "it is {0}", 10);
116+
.WithPreserveMethod(false, Reason, ReasonArgs);
114117

115118
a.Should().Throw<Exception>()
116119
.WithMessage(FailureMessageHelper.ExpectedContextToBeXButY("RedirectToActionResult.PreserveMethod", false, true));
@@ -125,7 +128,7 @@ public void WithRouteValue_GivenKeyDoesntExist_ShouldFail()
125128
var routeValues = new {myKey = "MyValue"};
126129
RedirectToActionResult result = new RedirectToActionResult(string.Empty, string.Empty, routeValues);
127130

128-
Action a = () => result.Should().BeRedirectToActionResult().WithRouteValue(expectedKey, "Val", "it is {0}", 10);
131+
Action a = () => result.Should().BeRedirectToActionResult().WithRouteValue(expectedKey, "Val", Reason, ReasonArgs);
129132

130133
a.Should().Throw<Exception>()
131134
.WithMessage(failureMessage);
@@ -152,7 +155,7 @@ public void HaveValue_GivenUnexpectedKeyValuePair_ShouldFail()
152155
var failureMessage = FailureMessageHelper.ExpectedAtKeyValueXButFoundY("RedirectToActionResult.RouteValues", expectedKey, expectedValue, "someOtherValue");
153156

154157
RedirectToActionResult result = new RedirectToActionResult(string.Empty, string.Empty, routeValues);
155-
Action a = () => result.Should().BeRedirectToActionResult().WithRouteValue(expectedKey, expectedValue, "it is {0}", 10);
158+
Action a = () => result.Should().BeRedirectToActionResult().WithRouteValue(expectedKey, expectedValue, Reason, ReasonArgs);
156159

157160
a.Should().Throw<Exception>()
158161
.WithMessage(failureMessage);

0 commit comments

Comments
 (0)