From f3e0863f529e8dc6b010e6a4cc6764ad6bb151f6 Mon Sep 17 00:00:00 2001 From: Kieran Devlin Date: Sat, 19 Sep 2020 17:20:18 +0100 Subject: [PATCH] Updated exception type for validation exceptions so that DataValidationErrors can extract the user friendly message. --- .../Data/Core/Plugins/DataAnnotationsValidationPlugin.cs | 4 ++-- .../Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs index 3b61f6d898..f052283b22 100644 --- a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs +++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs @@ -63,12 +63,12 @@ namespace Avalonia.Data.Core.Plugins { if (errors.Count == 1) { - return new ValidationException(errors[0].ErrorMessage); + return new DataValidationException(errors[0].ErrorMessage); } else { return new AggregateException( - errors.Select(x => new ValidationException(x.ErrorMessage))); + errors.Select(x => new DataValidationException(x.ErrorMessage))); } } } diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs index 5c8a941294..1d9524a191 100644 --- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs +++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs @@ -59,12 +59,12 @@ namespace Avalonia.Markup.UnitTests.Data.Plugins { new BindingNotification(5), new BindingNotification( - new ValidationException(errmsg), + new DataValidationException(errmsg), BindingErrorType.DataValidationError, 3), new BindingNotification(7), new BindingNotification( - new ValidationException(errmsg), + new DataValidationException(errmsg), BindingErrorType.DataValidationError, 11), }, result);