no need to throw to report errors

Author: lbargaoanu

docs/source/Configuration-validation.md

@@ -55,4 +55,4 @@ To skip validation altogether for this map, use `MemberList.None`. That's the de
 
 ## Custom validations
 
-You can add custom validations through an extension point. See [here](https://github.com/AutoMapper/AutoMapper/blob/bdc0120497d192a2741183415543f6119f50a982/src/UnitTests/CustomValidations.cs#L42).
+You can add custom validations through an extension point. See [here](https://github.com/AutoMapper/AutoMapper/blob/master/src/UnitTests/CustomValidations.cs).

src/AutoMapper/Configuration/ConfigurationValidator.cs

@@ -71,8 +71,7 @@ void DryRunTypeMap(TypePair types, TypeMap typeMap, MemberMap memberMap)
                     configExceptions.Add(new AutoMapperConfigurationException(memberMap.TypeMap.Types) { MemberMap = memberMap });
                     return;
                 }
-                if(Validate(new(types, memberMap, configExceptions, ObjectMapper: mapperToUse)) && mapperToUse.GetAssociatedTypes(types) is TypePair newTypes &&
-                    newTypes != types)
+                if(Validate(new(types, memberMap, configExceptions, ObjectMapper: mapperToUse)) && mapperToUse.GetAssociatedTypes(types) is TypePair newTypes)
                 {
                     DryRunTypeMap(newTypes, null, memberMap);
                 }

src/UnitTests/ConfigurationValidation.cs

@@ -5,16 +5,12 @@ public class Source
     {
         public decimal Foo { get; set; }
     }
-
     public class Destination
     {
         public Type Foo { get; set; }
         public string Bar { get; set; }
     }
-
-    protected override MapperConfiguration CreateConfiguration() =>
-        new(cfg => { cfg.CreateMap<Source, Destination>(); });
-
+    protected override MapperConfiguration CreateConfiguration() => new(cfg => cfg.CreateMap<Source, Destination>());
     [Fact]
     public void Should_throw_unmapped_member_and_mismatched_type_exceptions()
     {
@@ -35,24 +31,19 @@ public void Should_throw_unmapped_member_and_mismatched_type_exceptions()
             );
     }
 }
-
 public class When_testing_a_dto_with_mismatches_in_multiple_children : AutoMapperSpecBase
 {
     public class Source
     {
         public Type Foo { get; set; }
         public Type Bar { get; set; }
     }
-
     public class Destination
     {
         public int Foo { get; set; }
         public int Bar { get; set; }
     }
-
-    protected override MapperConfiguration CreateConfiguration() =>
-        new(cfg => { cfg.CreateMap<Source, Destination>(); });
-
+    protected override MapperConfiguration CreateConfiguration() => new(cfg => cfg.CreateMap<Source, Destination>());
     [Fact]
     public void Should_throw_for_both_mismatched_children()
     {
@@ -101,7 +92,7 @@ private ComplexType(int someMember)
     });
 
     [Fact]
-    public void Should_fail_validation() => new Action(AssertConfigurationIsValid).ShouldThrowException<AutoMapperConfigurationException>(ex=>
+    public void Should_fail_validation() => new Action(AssertConfigurationIsValid).ShouldThrowException<AutoMapperConfigurationException>(ex=>
         ex.MemberMap.ToString().ShouldBe("Void .ctor(ComplexType), parameter myComplexMember"));
 }
 
@@ -118,7 +109,7 @@ public class B
     public class C { }
 
     protected override MapperConfiguration CreateConfiguration() => new(cfg => cfg.CreateMap<A, B>().ConvertUsing(x => new B { Foo = new C() }));
-    [Fact]
+    [Fact]
     public void Validate() => AssertConfigurationIsValid();
 }
 
@@ -140,7 +131,7 @@ class Converter : ITypeConverter<A, B>
     {
         public B Convert(A source, B dest, ResolutionContext context) => new B { Foo = new C() };
     }
-    [Fact]
+    [Fact]
     public void Validate() => AssertConfigurationIsValid();
 }
 
@@ -254,7 +245,7 @@ public Dest(int value, int blarg)
     }
 
     protected override MapperConfiguration CreateConfiguration() => new(cfg =>
-    {
+    {
         cfg.CreateMap<Source, Dest>()
             .ForCtorParam("blarg", opt => opt.MapFrom(src => src.Value));
     });
@@ -354,84 +345,84 @@ public void Should_fail_a_configuration_check()
     {
         typeof(AutoMapperConfigurationException).ShouldBeThrownBy(AssertConfigurationIsValid);
     }
-}
-
+}
+
 public class ResolversWithSourceValidation : AutoMapperSpecBase
 {
     class Source
     {
-        public int Resolved { get; set; }
-        public int TypedResolved { get; set; }
-        public int Converted { get; set; }
+        public int Resolved { get; set; }
+        public int TypedResolved { get; set; }
+        public int Converted { get; set; }
         public int TypedConverted { get; set; }
     }
     class Destination
     {
-        public int ResolvedDest { get; set; }
-        public int TypedResolvedDest { get; set; }
-        public int ConvertedDest { get; set; }
+        public int ResolvedDest { get; set; }
+        public int TypedResolvedDest { get; set; }
+        public int ConvertedDest { get; set; }
         public int TypedConvertedDest { get; set; }
     }
     class MemberResolver : IMemberValueResolver<Source, Destination, int, int>
     {
         public int Resolve(Source source, Destination destination, int sourceMember, int destinationMember, ResolutionContext context) => 5;
-    }
-    class ValueConverter : IValueConverter<int, int>
-    {
-        public int Convert(int sourceMember, ResolutionContext context) => 5;
+    }
+    class ValueConverter : IValueConverter<int, int>
+    {
+        public int Convert(int sourceMember, ResolutionContext context) => 5;
     }
     protected override MapperConfiguration CreateConfiguration() => new(cfg =>
     {
         cfg.CreateMap<Source, Destination>(MemberList.Source)
-            .ForMember(d => d.ResolvedDest, o => o.MapFrom<MemberResolver, int>("Resolved"))
-            .ForMember(d=>d.TypedResolvedDest, o => o.MapFrom<MemberResolver, int>(s => s.TypedResolved))
-            .ForMember(d => d.ConvertedDest, o => o.ConvertUsing<ValueConverter, int>("Converted"))
+            .ForMember(d => d.ResolvedDest, o => o.MapFrom<MemberResolver, int>("Resolved"))
+            .ForMember(d=>d.TypedResolvedDest, o => o.MapFrom<MemberResolver, int>(s => s.TypedResolved))
+            .ForMember(d => d.ConvertedDest, o => o.ConvertUsing<ValueConverter, int>("Converted"))
             .ForMember(d => d.TypedConvertedDest, o => o.ConvertUsing<ValueConverter, int>(s => s.TypedConverted));
     });
     [Fact]
     public void Should_work()
     {
         var result = Mapper.Map<Source, Destination>(new Source());
-        result.ResolvedDest.ShouldBe(5);
-        result.TypedResolvedDest.ShouldBe(5);
-        result.ConvertedDest.ShouldBe(5);
+        result.ResolvedDest.ShouldBe(5);
+        result.TypedResolvedDest.ShouldBe(5);
+        result.ConvertedDest.ShouldBe(5);
         result.TypedConvertedDest.ShouldBe(5);
     }
 }
-
-public class NonMemberExpressionWithSourceValidation : NonValidatingSpecBase
-{
-    class Source
-    {
-        public string Value { get; set; }
-    }
-    class Destination
-    {
-        public string OtherValue { get; set; }
-    }
-    protected override MapperConfiguration CreateConfiguration() => new(c=>c.CreateMap<Source, Destination>(MemberList.Source)
-        .ForMember(d=>d.OtherValue, o=>o.MapFrom(s=>s.Value ?? "")));
-    [Fact]
-    public void Should_be_ignored() => new Action(AssertConfigurationIsValid)
-        .ShouldThrow<AutoMapperConfigurationException>().Errors[0].UnmappedPropertyNames[0].ShouldBe(nameof(Source.Value));
-}
-
-public class MatchingNonMemberExpressionWithSourceValidation : NonValidatingSpecBase
-{
-    class Source
-    {
-        public string Value { get; set; }
-    }
-    class Destination
-    {
-        public string Value { get; set; }
-    }
-    protected override MapperConfiguration CreateConfiguration() => new(c => c.CreateMap<Source, Destination>(MemberList.Source)
-        .ForMember(d => d.Value, o => o.MapFrom(s => s.Value ?? "")));
-    [Fact]
-    public void Should_be_ignored() => new Action(AssertConfigurationIsValid)
-        .ShouldThrow<AutoMapperConfigurationException>().Errors[0].UnmappedPropertyNames[0].ShouldBe(nameof(Source.Value));
-}
+
+public class NonMemberExpressionWithSourceValidation : NonValidatingSpecBase
+{
+    class Source
+    {
+        public string Value { get; set; }
+    }
+    class Destination
+    {
+        public string OtherValue { get; set; }
+    }
+    protected override MapperConfiguration CreateConfiguration() => new(c=>c.CreateMap<Source, Destination>(MemberList.Source)
+        .ForMember(d=>d.OtherValue, o=>o.MapFrom(s=>s.Value ?? "")));
+    [Fact]
+    public void Should_be_ignored() => new Action(AssertConfigurationIsValid)
+        .ShouldThrow<AutoMapperConfigurationException>().Errors[0].UnmappedPropertyNames[0].ShouldBe(nameof(Source.Value));
+}
+
+public class MatchingNonMemberExpressionWithSourceValidation : NonValidatingSpecBase
+{
+    class Source
+    {
+        public string Value { get; set; }
+    }
+    class Destination
+    {
+        public string Value { get; set; }
+    }
+    protected override MapperConfiguration CreateConfiguration() => new(c => c.CreateMap<Source, Destination>(MemberList.Source)
+        .ForMember(d => d.Value, o => o.MapFrom(s => s.Value ?? "")));
+    [Fact]
+    public void Should_be_ignored() => new Action(AssertConfigurationIsValid)
+        .ShouldThrow<AutoMapperConfigurationException>().Errors[0].UnmappedPropertyNames[0].ShouldBe(nameof(Source.Value));
+}
 
 public class When_testing_a_dto_with_fully_mapped_and_custom_matchers : AutoMapperSpecBase
 {
@@ -452,7 +443,7 @@ public class ModelDto
         cfg.CreateMap<ModelObject, ModelDto>()
             .ForMember(dto => dto.Bar, opt => opt.MapFrom(m => m.Barr));
     });
-    [Fact]
+    [Fact]
     public void Validate() => AssertConfigurationIsValid();
 }
 
@@ -840,14 +831,14 @@ interface IAbstractDest
     {
         string DifferentName { get; set; }
     }
-}
-
+}
+
 public class When_configuring_a_resolver : AutoMapperSpecBase
-{
+{
     protected override MapperConfiguration CreateConfiguration() => new(cfg =>
     {
         cfg.CreateMap<Query, Command>().ForMember(d => d.Details, o => o.MapFrom<DetailsValueResolver>());
-    });
+    });
     public class DetailsValueResolver : IValueResolver<Query, Command, List<KeyValuePair<string, string>>>
     {
         public List<KeyValuePair<string, string>> Resolve(Query source, Command destination, List<KeyValuePair<string, string>> destMember, ResolutionContext context)
@@ -865,29 +856,29 @@ public class Query
     public class Command
     {
         public List<KeyValuePair<string, string>> Details { get; private set; }
-    }
-    [Fact]
-    public void Validate() => AssertConfigurationIsValid();
-}
+    }
+    [Fact]
+    public void Validate() => AssertConfigurationIsValid();
+}
 public class ObjectPropertyAndNestedTypes : AutoMapperSpecBase
-{
+{
     protected override MapperConfiguration CreateConfiguration() => new(cfg => cfg.CreateMap<RootLevel, RootLevelDto>());
-    public class RootLevel
-    {
-        public object ObjectProperty { get; set; }
-        public SecondLevel SecondLevel { get; set; }
-    }
-    public class RootLevelDto
-    {
-        public object ObjectProperty { get; set; }
-        public SecondLevelDto SecondLevel { get; set; }
-    }
-    public class SecondLevel
-    {
-    }
-    public class SecondLevelDto
-    {
-    }
+    public class RootLevel
+    {
+        public object ObjectProperty { get; set; }
+        public SecondLevel SecondLevel { get; set; }
+    }
+    public class RootLevelDto
+    {
+        public object ObjectProperty { get; set; }
+        public SecondLevelDto SecondLevel { get; set; }
+    }
+    public class SecondLevel
+    {
+    }
+    public class SecondLevelDto
+    {
+    }
     [Fact]
     public void Should_fail_validation() => new Action(AssertConfigurationIsValid).ShouldThrow<AutoMapperConfigurationException>().MemberMap.DestinationName.ShouldBe(nameof(RootLevelDto.SecondLevel));
 }

src/UnitTests/CustomValidations.cs

@@ -38,7 +38,7 @@ public void Should_call_the_validator()
                 cfg.CreateMap<Source, Dest>();
             });
 
-            config.AssertConfigurationIsValid();
+            new Action(config.AssertConfigurationIsValid).ShouldThrow<AutoMapperConfigurationException>().Message.ShouldBe(nameof(When_using_custom_validation));
 
             _calledForRoot.ShouldBeTrue();
             _calledForValues.ShouldBeTrue();
@@ -55,6 +55,7 @@ private void Validator(ValidationContext context)
                 context.Types.DestinationType.ShouldBe(typeof(Dest));
                 context.ObjectMapper.ShouldBeNull();
                 context.MemberMap.ShouldBeNull();
+                context.Exceptions.Add(new AutoMapperConfigurationException(nameof(When_using_custom_validation)));
             }
             else
             {