From c4e28c127dd297fa6aefbeea151f994bf0836aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=9C=E5=B0=8F=E7=A5=9E?= Date: Mon, 23 Dec 2019 03:02:32 +0800 Subject: [PATCH 1/3] Update FluentObjectValidationContributor.cs fixed validationErrors members --- .../Abp/FluentValidation/FluentObjectValidationContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs index f926782e2d..c83e51e909 100644 --- a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs +++ b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.FluentValidation context.Errors.AddRange( result.Errors.Select( error => - new ValidationResult(error.ErrorMessage) + new ValidationResult(error.ErrorMessage, new []{error.PropertyName}) ) ); } From c3181334844bc858c2936a917e60d5507359c529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=9C=E5=B0=8F=E7=A5=9E?= Date: Mon, 23 Dec 2019 14:54:08 +0800 Subject: [PATCH 2/3] fixed unittest for FluentValidation --- .../ApplicationService_FluentValidation_Tests.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs b/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs index 0cde05efd4..61852ec46d 100644 --- a/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs +++ b/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs @@ -1,3 +1,4 @@ +using System.Linq; using System.Threading.Tasks; using FluentValidation; using Microsoft.Extensions.DependencyInjection; @@ -63,7 +64,7 @@ namespace Volo.Abp.FluentValidation { // MyStringValue should be aaa, MyStringValue2 should be bbb. MyStringValue3 should be ccc - Assert.Throws(() => _myAppService.MyMethod(new MyMethodInput + var exception = Assert.Throws(() => _myAppService.MyMethod(new MyMethodInput { MyStringValue = "a", MyMethodInput2 = new MyMethodInput2 @@ -75,8 +76,11 @@ namespace Volo.Abp.FluentValidation MyStringValue3 = "c" } })); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyStringValue")); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyMethodInput2.MyStringValue2")); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyMethodInput3.MyStringValue3")); - await Assert.ThrowsAsync(async () => await _myAppService.MyMethodAsync( + exception = await Assert.ThrowsAsync(async () => await _myAppService.MyMethodAsync( new MyMethodInput { MyStringValue = "a", @@ -89,6 +93,9 @@ namespace Volo.Abp.FluentValidation MyStringValue3 = "c" } })); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyStringValue")); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyMethodInput2.MyStringValue2")); + exception.ValidationErrors.ShouldContain(x => x.MemberNames.Contains("MyMethodInput3.MyStringValue3")); } [Fact] From 689091935706dd9b46ca592173257a1e047c38c2 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 23 Dec 2019 17:29:06 +0800 Subject: [PATCH 3/3] Update FluentObjectValidationContributor.cs --- .../Abp/FluentValidation/FluentObjectValidationContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs index c83e51e909..e699e0093a 100644 --- a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs +++ b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/FluentObjectValidationContributor.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.FluentValidation context.Errors.AddRange( result.Errors.Select( error => - new ValidationResult(error.ErrorMessage, new []{error.PropertyName}) + new ValidationResult(error.ErrorMessage, new[] { error.PropertyName }) ) ); }