Skip to content

Commit

Permalink
Radekwojpl2/critical error result (#143)
Browse files Browse the repository at this point in the history 
* Added CriticalError to ResultStatuses (#140)

* Updated tests

---------

Co-authored-by: JosnocSackra <[email protected]>
Co-authored-by: AVANADE-CORP\r.bajor <[email protected]>
Co-authored-by: Steve Smith <[email protected]>
  • Loading branch information
@radekwojpl2 @EnochMtzR @ardalis
4 people committed Sep 13, 2023
1 parent 2dfc6f3 commit f75c955
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 8 additions & 4 deletions tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void TranslateAttributeOnAction()

convention.Apply(actionModel);

Assert.Equal(7, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(8, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 204, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Expand All @@ -27,6 +27,7 @@ public void TranslateAttributeOnAction()
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 403, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}

[Fact]
Expand All @@ -41,7 +42,7 @@ public void TranslateAttributeOnController()

convention.Apply(actionModel);

Assert.Equal(7, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(8, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 204, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Expand All @@ -50,6 +51,7 @@ public void TranslateAttributeOnController()
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 403, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}

[Fact]
Expand Down Expand Up @@ -79,7 +81,7 @@ public void ExistingProducesResponseTypeAttributePreserved()

convention.Apply(actionModel);

Assert.Equal(7, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(8, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 204, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Expand All @@ -88,6 +90,7 @@ public void ExistingProducesResponseTypeAttributePreserved()
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 403, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}

[Theory]
Expand All @@ -104,7 +107,7 @@ public void ResultWithValue(string actionName, Type expectedType)

convention.Apply(actionModel);

Assert.Equal(7, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(8, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 200, expectedType));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Expand All @@ -113,5 +116,6 @@ public void ResultWithValue(string actionName, Type expectedType)
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 403, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}
}
6 changes: 4 additions & 2 deletions tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMapModified.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ public void RemoveResultStatus()

convention.Apply(actionModel);

Assert.Equal(5, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(6, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 204, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 400, typeof(ValidationProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}

[Fact]
Expand Down Expand Up @@ -81,7 +82,7 @@ public void ChangeResultStatus_ForSpecificMethods(string actionName, Type expect

convention.Apply(actionModel);

Assert.Equal(7, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());
Assert.Equal(8, actionModel.Filters.Where(f => f is ProducesResponseTypeAttribute).Count());

Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, expectedStatusCode, expectedType));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 404, typeof(ProblemDetails)));
Expand All @@ -90,5 +91,6 @@ public void ChangeResultStatus_ForSpecificMethods(string actionName, Type expect
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 403, typeof(void)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 409, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 422, typeof(ProblemDetails)));
Assert.Contains(actionModel.Filters, f => ProducesResponseTypeAttribute(f, 500, typeof(ProblemDetails)));
}
}

0 comments on commit f75c955

Please sign in to comment.