From f75c9556c884a124e7a1b24d5d74197222dbfab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Bajor?= <62394072+radekwojpl2@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:11:32 +0200 Subject: [PATCH] Radekwojpl2/critical error result (#143) * Added CriticalError to ResultStatuses (#140) * Updated tests --------- Co-authored-by: JosnocSackra Co-authored-by: AVANADE-CORP\r.bajor Co-authored-by: Steve Smith --- .../ResultConventionDefaultResultStatusMap.cs | 12 ++++++++---- ...ResultConventionDefaultResultStatusMapModified.cs | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMap.cs b/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMap.cs index c8fd586..d06c2c4 100644 --- a/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMap.cs +++ b/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMap.cs @@ -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))); @@ -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] @@ -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))); @@ -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] @@ -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))); @@ -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] @@ -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))); @@ -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))); } } diff --git a/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMapModified.cs b/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMapModified.cs index 92ab1dc..8516d22 100644 --- a/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMapModified.cs +++ b/tests/Ardalis.Result.AspNetCore.UnitTests/ResultConventionDefaultResultStatusMapModified.cs @@ -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] @@ -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))); @@ -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))); } }