Skip to content

Commit 7a6a041

Browse files
committed
Fix BadRequestObjectResultAssertions tests.
1 parent 7b512db commit 7a6a041

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/FluentAssertions.AspNetCore.Mvc/BadRequestObjectResultAssertions.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,14 @@ public TError ErrorAs<TError>()
4545
var error = Error;
4646

4747
if (error == null)
48-
Execute.Assertion.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, "BadRequestObjectResult.Error", typeof(TError).Name);
48+
Execute.Assertion
49+
.WithDefaultIdentifier("BadRequestObjectResult.Error")
50+
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TError));
4951

5052
Execute.Assertion
5153
.ForCondition(error is TError)
52-
.FailWith(FailureMessages.CommonTypeFailMessage, "BadRequestObjectResult.Error", typeof(TError).Name, error.GetType().Name);
54+
.WithDefaultIdentifier("BadRequestObjectResult.Error")
55+
.FailWith(FailureMessages.CommonTypeFailMessage, typeof(TError), error.GetType());
5356

5457
return (TError)error;
5558
}

tests/FluentAssertions.AspNetCore.Mvc.Tests/BadRequestObjectResultAssertions_Tests.cs

+11-14
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,18 @@ public class BadRequestObjectResultAssertions_Tests
1313
public void Error_GivenExpectedError_ShouldPass()
1414
{
1515
var result = new TestController().BadRequest(TestError);
16-
result.Should().BeBadRequestObjectResult().Error.Should().Be(TestError);
17-
}
18-
19-
[Fact]
20-
public void Error_GivenUnexpectedError_ShouldFail()
21-
{
22-
var result = new TestController().BadRequest(TestError);
23-
24-
Action a = () => result.Should().BeBadRequestObjectResult().Error.Should().Be("xyx");
25-
a.Should().Throw<Exception>();
16+
result.Should().BeBadRequestObjectResult().Error.Should().BeSameAs(TestError);
2617
}
2718

2819
[Fact]
2920
public void SerializableError_GivenExpectedModelState_ShouldPass()
3021
{
3122
const string testErrorKey = "TestErrorKey";
3223
const string testErrorMessage = "TestErrorMessage";
33-
3424
var testModelState = new ModelStateDictionary();
3525
testModelState.AddModelError(testErrorKey, testErrorMessage);
3626
var result = new TestController().BadRequest(testModelState);
27+
3728
result.Should().BeBadRequestObjectResult().SerializableError.Should().ContainKey(testErrorKey);
3829
}
3930

@@ -57,18 +48,24 @@ public void ErrorAs_GivenUnexpectedError_ShouldFail()
5748
[Fact]
5849
public void ErrorAs_GivenWrongType_ShouldFail()
5950
{
60-
var result = new TestController().BadRequest(TestError);
51+
var result = new TestController().BadRequest(TestError);
52+
var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
53+
"BadRequestObjectResult.Error", typeof(int), typeof(string));
6154

6255
Action a = () => result.Should().BeBadRequestObjectResult().ErrorAs<int>().Should().Be(2);
63-
a.Should().Throw<Exception>();
56+
57+
a.Should().Throw<Exception>().WithMessage(failureMessage);
6458
}
6559

6660
[Fact]
6761
public void ErrorAs_Null_ShouldFail()
6862
{
6963
ActionResult result = new BadRequestObjectResult(null as object);
70-
var failureMessage = FailureMessageHelper.Format(FailureMessages.CommonNullWasSuppliedFailMessage, "BadRequestObjectResult.Error", typeof(object).Name);
64+
var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
65+
"BadRequestObjectResult.Error", typeof(object));
66+
7167
Action a = () => result.Should().BeBadRequestObjectResult().ErrorAs<object>();
68+
7269
a.Should().Throw<Exception>().WithMessage(failureMessage);
7370
}
7471
}

0 commit comments

Comments
 (0)