Skip to content

Commit a3580a4

Browse files
committed
Implemented part of the pipeline (.Which) functionality (#282)
1 parent 84df2cb commit a3580a4

File tree

18 files changed

+193
-43
lines changed

18 files changed

+193
-43
lines changed

src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/Validators/CommonValidator.cs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,25 @@ public static void CheckForEqualityWithDefaultValue<T>(T value, string errorMess
5252
throw new InvalidOperationException(errorMessage);
5353
}
5454
}
55-
55+
5656
/// <summary>
5757
/// Validates that two objects are equal using the Equals method.
5858
/// </summary>
5959
/// <typeparam name="T">Type of the objects.</typeparam>
6060
/// <param name="expected">Expected object.</param>
6161
/// <param name="actual">Actual object.</param>
6262
/// <returns>True or false.</returns>
63-
public static bool CheckEquality<T>(T expected, T actual)
64-
{
65-
return expected.Equals(actual);
66-
}
63+
public static bool CheckEquality<T>(T expected, T actual)
64+
=> expected.Equals(actual);
6765

6866
/// <summary>
6967
/// Validates whether object equals the default value for its type.
7068
/// </summary>
7169
/// <typeparam name="TValue">Type of the value.</typeparam>
7270
/// <param name="value">Object to test.</param>
7371
/// <returns>True or false.</returns>
74-
public static bool CheckForDefaultValue<TValue>(TValue value)
75-
{
76-
return EqualityComparer<TValue>.Default.Equals(value, default(TValue));
77-
}
72+
public static bool CheckForDefaultValue<TValue>(TValue value)
73+
=> EqualityComparer<TValue>.Default.Equals(value, default);
7874

7975
/// <summary>
8076
/// Validates whether type can be null.
@@ -89,11 +85,9 @@ public static void CheckIfTypeCanBeNull(Type type)
8985
}
9086
}
9187

92-
private static string FormatExceptionMessage(string message)
93-
{
94-
return string.IsNullOrWhiteSpace(message)
88+
private static string FormatExceptionMessage(string message)
89+
=> string.IsNullOrWhiteSpace(message)
9590
? string.Empty
9691
: $" with '{message}' message";
97-
}
9892
}
9993
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnAccepted.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1818
/// <inheritdoc />
1919
public IAndTestBuilder Accepted(Action<IAcceptedTestBuilder> acceptedTestBuilder)
2020
{
21-
if (this.ActionResult is AcceptedAtActionResult)
21+
if (this.ObjectActionResult is AcceptedAtActionResult)
2222
{
2323
return this.ValidateAcceptedResult<AcceptedAtActionResult>(acceptedTestBuilder);
2424
}
2525

26-
if (this.ActionResult is AcceptedAtRouteResult)
26+
if (this.ObjectActionResult is AcceptedAtRouteResult)
2727
{
2828
return this.ValidateAcceptedResult<AcceptedAtRouteResult>(acceptedTestBuilder);
2929
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnBadRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1717
/// <inheritdoc />
1818
public IAndTestBuilder BadRequest(Action<IBadRequestTestBuilder> badRequestTestBuilder)
1919
{
20-
if (this.ActionResult is BadRequestObjectResult)
20+
if (this.ObjectActionResult is BadRequestObjectResult)
2121
{
2222
return this.ValidateBadRequestResult<BadRequestObjectResult>(badRequestTestBuilder);
2323
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnConflict.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1717
/// <inheritdoc />
1818
public IAndTestBuilder Conflict(Action<IConflictTestBuilder> conflictTestBuilder)
1919
{
20-
if (this.ActionResult is ConflictObjectResult)
20+
if (this.ObjectActionResult is ConflictObjectResult)
2121
{
2222
return this.ValidateConflictResult<ConflictObjectResult>(conflictTestBuilder);
2323
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnCreated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1818
/// <inheritdoc />
1919
public IAndTestBuilder Created(Action<ICreatedTestBuilder> createdTestBuilder)
2020
{
21-
if (this.ActionResult is CreatedAtActionResult)
21+
if (this.ObjectActionResult is CreatedAtActionResult)
2222
{
2323
return this.ValidateCreatedResult<CreatedAtActionResult>(createdTestBuilder);
2424
}
2525

26-
if (this.ActionResult is CreatedAtRouteResult)
26+
if (this.ObjectActionResult is CreatedAtRouteResult)
2727
{
2828
return this.ValidateCreatedResult<CreatedAtRouteResult>(createdTestBuilder);
2929
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnFile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1818
/// <inheritdoc />
1919
public IAndTestBuilder File(Action<IFileTestBuilder> fileTestBuilder)
2020
{
21-
if (this.ActionResult is VirtualFileResult)
21+
if (this.ObjectActionResult is VirtualFileResult)
2222
{
2323
return this.ValidateFileResult<VirtualFileResult>(fileTestBuilder);
2424
}
2525

26-
if (this.ActionResult is FileStreamResult)
26+
if (this.ObjectActionResult is FileStreamResult)
2727
{
2828
return this.ValidateFileResult<FileStreamResult>(fileTestBuilder);
2929
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnNotFound.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1717
/// <inheritdoc />
1818
public IAndTestBuilder NotFound(Action<INotFoundTestBuilder> notFoundTestBuilder)
1919
{
20-
if (this.ActionResult is NotFoundObjectResult)
20+
if (this.ObjectActionResult is NotFoundObjectResult)
2121
{
2222
return this.ValidateNotFoundResult<NotFoundObjectResult>(notFoundTestBuilder);
2323
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnNullOrDefault.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,14 @@ public IAndTestBuilder NotNull()
5353
return new AndTestBuilder(this.TestContext);
5454
}
5555

56-
private bool CheckValidDefaultValue()
57-
{
58-
return CommonValidator.CheckForDefaultValue(this.ActionResult) && this.CaughtException == null;
59-
}
56+
private bool CheckValidDefaultValue()
57+
=> CommonValidator.CheckForDefaultValue(this.ActionResult) && this.CaughtException == null;
6058

61-
private void ThrowNewActionResultAssertionException(string message)
62-
{
63-
throw new InvocationResultAssertionException(string.Format(
59+
private void ThrowNewActionResultAssertionException(string message)
60+
=> throw new InvocationResultAssertionException(string.Format(
6461
"When calling {0} action in {1} expected action result to be {2}",
6562
this.ActionName,
6663
this.Controller.GetName(),
6764
message));
68-
}
6965
}
7066
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnOk.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1717
/// <inheritdoc />
1818
public IAndTestBuilder Ok(Action<IOkTestBuilder> okTestBuilder)
1919
{
20-
if (this.ActionResult is OkObjectResult)
20+
if (this.ObjectActionResult is OkObjectResult)
2121
{
2222
return this.ValidateOkResult<OkObjectResult>(okTestBuilder);
2323
}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnRedirect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public partial class ShouldReturnTestBuilder<TActionResult>
1818
/// <inheritdoc />
1919
public IAndTestBuilder Redirect(Action<IRedirectTestBuilder> redirectTestBuilder)
2020
{
21-
if (this.ActionResult is RedirectToRouteResult)
21+
if (this.ObjectActionResult is RedirectToRouteResult)
2222
{
2323
return this.ValidateRedirectResult<RedirectToRouteResult>(redirectTestBuilder);
2424
}
2525

26-
if (this.ActionResult is RedirectToActionResult)
26+
if (this.ObjectActionResult is RedirectToActionResult)
2727
{
2828
return this.ValidateRedirectResult<RedirectToActionResult>(redirectTestBuilder);
2929
}

0 commit comments

Comments
 (0)