diff --git a/README.md b/README.md index d7664de..d08a8e9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ To use, configure using the configuration helper method: var mapper = new Mapper(new MapperConfiguration(cfg => { cfg.AddExpressionMapping(); // Rest of your configuration -})); +}, loggerFactory)); // or if using the MS Ext DI: diff --git a/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj b/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj index 72a9846..fe59df1 100644 --- a/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj +++ b/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj @@ -3,7 +3,7 @@ Expression mapping (OData) extensions for AutoMapper Expression mapping (OData) extensions for AutoMapper - net8.0 + net8.0 true ..\..\AutoMapper.snk true @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/AutoMapper.Extensions.ExpressionMapping/ConfigurationHelper.cs b/src/AutoMapper.Extensions.ExpressionMapping/ConfigurationHelper.cs new file mode 100644 index 0000000..ab362fa --- /dev/null +++ b/src/AutoMapper.Extensions.ExpressionMapping/ConfigurationHelper.cs @@ -0,0 +1,18 @@ +using Microsoft.Extensions.Logging.Abstractions; +using System; + +namespace AutoMapper.Extensions.ExpressionMapping +{ + public static class ConfigurationHelper + { + public static MapperConfiguration GetMapperConfiguration(Action configure) + { + return new MapperConfiguration(configure, new NullLoggerFactory()); + } + + public static MapperConfiguration GetMapperConfiguration(MapperConfigurationExpression configurationExpression) + { + return new MapperConfiguration(configurationExpression, new NullLoggerFactory()); + } + } +} diff --git a/src/AutoMapper.Extensions.ExpressionMapping/ExpressionMapper.cs b/src/AutoMapper.Extensions.ExpressionMapping/ExpressionMapper.cs index 8f51b56..d90cba1 100644 --- a/src/AutoMapper.Extensions.ExpressionMapping/ExpressionMapper.cs +++ b/src/AutoMapper.Extensions.ExpressionMapping/ExpressionMapper.cs @@ -32,6 +32,11 @@ public Expression MapExpression(IGlobalConfiguration configurationProvider, Prof Constant(configurationProvider) ); + public TypePair? GetAssociatedTypes(TypePair initialTypes) + { + return null; + } + internal class MappingVisitor : ExpressionVisitor { private IList _destSubTypes = new Type[0]; diff --git a/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs b/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs index 15cafb7..c59e4e4 100644 --- a/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs +++ b/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs @@ -286,7 +286,7 @@ private void ConfigureAnonymousTypeMaps(Type oldType, Type newAnonymousType) } }); - anonymousTypesConfigurationProvider = new MapperConfiguration(anonymousTypesBaseMappings); + anonymousTypesConfigurationProvider = ConfigurationHelper.GetMapperConfiguration(anonymousTypesBaseMappings); } private MemberInitExpression GetAnonymousTypeMemberInitExpression(Dictionary bindingExpressions, Type oldType) diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithListConstants.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithListConstants.cs index c1ab754..96f9c10 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithListConstants.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithListConstants.cs @@ -12,7 +12,7 @@ public class CanMapExpressionWithListConstants public void Map_expression_with_constant_array() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { @@ -43,7 +43,7 @@ public void Map_expression_with_constant_array() public void Map_expression_with_constant_list_using_generic_list_dot_contains() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { @@ -73,7 +73,7 @@ public void Map_expression_with_constant_list_using_generic_list_dot_contains() public void Map_expression_with_constant_list_using_generic_enumerable_dot_contains() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { @@ -103,7 +103,7 @@ public void Map_expression_with_constant_list_using_generic_enumerable_dot_conta public void Map_expression_with_constant_dictionary() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { @@ -133,7 +133,7 @@ public void Map_expression_with_constant_dictionary() public void Map_expression_with_constant_dictionary_mapping_both_Key_and_value() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithLocalExpressionConstant.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithLocalExpressionConstant.cs index d83f867..1451df4 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithLocalExpressionConstant.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapExpressionWithLocalExpressionConstant.cs @@ -12,7 +12,7 @@ public class CanMapExpressionWithLocalExpressionConstant public void Map_expression_wchich_includes_local_constant() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMemberFromTypeBinaryExpression.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMemberFromTypeBinaryExpression.cs index 68c1877..bd42d44 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMemberFromTypeBinaryExpression.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMemberFromTypeBinaryExpression.cs @@ -12,7 +12,7 @@ public class CanMapMemberFromTypeBinaryExpression public void Can_map_using_type_binary_expression_to_test_the_parameter_expression() { //arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -41,7 +41,7 @@ public void Can_map_using_type_binary_expression_to_test_the_parameter_expressio public void Can_map_using_type_binary_expression_to_test_a_member_expression() { //arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -77,7 +77,7 @@ public void Can_map_using_type_binary_expression_to_test_a_member_expression() public void Can_map_using_instance_method_call_to_test_the_parameter_expression() { //arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -101,7 +101,7 @@ public void Can_map_using_instance_method_call_to_test_the_parameter_expression( public void Can_map_using_static_method_call_to_test_the_parameter_expression() { //arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -129,7 +129,7 @@ public void Can_map_using_static_method_call_to_test_the_parameter_expression() public void Can_map_using_static_generic_method_call_to_test_the_parameter_expression() { //arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMismatchedLiteralMemberExpressionsWithoutCustomExpressions.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMismatchedLiteralMemberExpressionsWithoutCustomExpressions.cs index cfd5472..ecf7bbf 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMismatchedLiteralMemberExpressionsWithoutCustomExpressions.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapMismatchedLiteralMemberExpressionsWithoutCustomExpressions.cs @@ -198,7 +198,7 @@ public void CanMapNullableSelectorToNonNullableelectorWithoutCustomExpression(st private static IMapper GetModelToDataMapper() { - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap(); }); @@ -208,7 +208,7 @@ private static IMapper GetModelToDataMapper() private static IMapper GetDataToModelMapper() { - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap(); }); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs index 0c26713..5848f28 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs @@ -12,7 +12,7 @@ public class CanMapParameterBodyFromChildReferenceWithoutMemberExpression public void Can_map_parameter_body_from_child_reference_without_member_expression() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ForMember(p => p.Brand, c => c.MapFrom(p => EF.Property(p, "BrandId"))); ; @@ -42,7 +42,7 @@ public class TestCategory } public class TestProduct { - public TestCategory? Category { get; set; } + public TestCategory Category { get; set; } } public class TestProductDTO diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs index f0e8db3..c4676a0 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs @@ -12,7 +12,7 @@ public class CanMapParameterBodyWithoutMemberExpression public void Can_map_parameter_body_without_member_expression() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ForMember(p => p.Brand, c => c.MapFrom(p => EF.Property(p, "BrandId"))); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/EnumerableDotContainsWorksOnLocalVariables.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/EnumerableDotContainsWorksOnLocalVariables.cs index 8fec94b..723c141 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/EnumerableDotContainsWorksOnLocalVariables.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/EnumerableDotContainsWorksOnLocalVariables.cs @@ -12,7 +12,7 @@ public class EnumerableDotContainsWorksOnLocalVariables [Fact] public void Issue87() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExplicitExpansionAsDataSource.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExplicitExpansionAsDataSource.cs index 0690279..224d0c2 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExplicitExpansionAsDataSource.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExplicitExpansionAsDataSource.cs @@ -44,7 +44,7 @@ public class GrandChildDest } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.CreateMap() @@ -145,7 +145,7 @@ public class GrandChildDest } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.CreateMap() .ForMember(m => m.Child1, opt => opt.ExplicitExpansion()) diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs index 15c9814..aa0a9b7 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs @@ -53,7 +53,7 @@ public class DestWithEnum : Dest [Fact] public void Can_map_unary_expression_converting_enum_to_int() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -77,7 +77,7 @@ public void Can_map_unary_expression_converting_enum_to_int() [Fact] public void Can_map_single_properties() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -100,7 +100,7 @@ public void Can_map_single_properties() [Fact] public void Can_map_flattened_properties() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -123,7 +123,7 @@ public void Can_map_flattened_properties() [Fact] public void Can_map_custom_mapped_properties() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap().ForMember(d => d.Bar, opt => opt.MapFrom(src => src.Foo)); @@ -146,7 +146,7 @@ public void Can_map_custom_mapped_properties() [Fact] public void Throw_AutoMapperMappingException_if_expression_types_dont_match() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -160,7 +160,7 @@ public void Throw_AutoMapperMappingException_if_expression_types_dont_match() [Fact] public void Can_map_with_different_destination_types() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap().ForMember(d => d.Bar, opt => opt.MapFrom(src => src.Foo)); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs index 8fd3643..6638c39 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs @@ -23,7 +23,7 @@ public class DestExpressionHolder public Expression> Expression { get; set; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap().ReverseMap(); @@ -109,7 +109,7 @@ public Parent Parent private Expression> _predicateExpression; private Parent _valid; - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap().ReverseMap(); @@ -319,7 +319,7 @@ public class TestModel public string Code { get; set; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(config => config.CreateMap()); + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(config => config.CreateMap()); public void Should_map_with_closures() { diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs index bda7b52..75d841a 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs @@ -69,7 +69,7 @@ protected override MapperConfiguration Configuration { get { - return new MapperConfiguration(config => + return ConfigurationHelper.GetMapperConfiguration(config => { config.AddExpressionMapping(); config.CreateMap, EntityDto>() @@ -169,7 +169,6 @@ protected override MapperConfiguration Configuration [InlineData(SimpleEnumUInt.Value3, 1U)] [InlineData(SimpleEnumLong.Value3, 1L)] [InlineData(SimpleEnumULong.Value3, 1UL)] - [InlineData(SimpleEnumSByte.Value3, (sbyte)3)] [InlineData(SimpleEnumByte.Value3, (byte)3)] [InlineData(SimpleEnumShort.Value3, (short)3)] [InlineData(SimpleEnumUShort.Value3, (ushort)3)] diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromBaseClass.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromBaseClass.cs index 4ccbac5..1c471e3 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromBaseClass.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromBaseClass.cs @@ -39,7 +39,7 @@ protected override MapperConfiguration Configuration { get { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); // issue #1886 diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromDerviedType.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromDerviedType.cs index e26c978..1833f21 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromDerviedType.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingPropertyFromDerviedType.cs @@ -17,7 +17,7 @@ protected override MapperConfiguration Configuration { get { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.AddProfile(typeof(DerivedTypeProfile)); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingWithUseAsDataSource.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingWithUseAsDataSource.cs index 8bbc8da..13e59d4 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingWithUseAsDataSource.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingWithUseAsDataSource.cs @@ -73,7 +73,7 @@ public void Should_Map_From_Generic_Type() private static IMapper CreateMapper() { - var mapperConfig = new MapperConfiguration(cfg => + var mapperConfig = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.CreateMap() .ForMember(d => d.Nested, opt => opt.MapFrom(s => s)); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs index 01bb42b..b3739e2 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs @@ -35,7 +35,7 @@ public class Destination public string[] Strings { get; set; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.CreateMap() .ForMember(s => s.SrcValue, opt => opt.MapFrom(d => d.DestValue)) @@ -480,7 +480,7 @@ public void SupportsParmeterization() int value = 0; Expression> sourceMember = src => value + 5; - var config = new MapperConfiguration(cfg => cfg.CreateMap() + var config = ConfigurationHelper.GetMapperConfiguration(cfg => cfg.CreateMap() .ForMember(dest => dest.Value, opt => opt.MapFrom(sourceMember))); var mapper = new Mapper(config); @@ -505,7 +505,7 @@ public void SupportsParmeterization_DoesNotCacheParameter() int value = 0; Expression> sourceMember = src => value + 5; - var config = new MapperConfiguration(cfg => cfg.CreateMap() + var config = ConfigurationHelper.GetMapperConfiguration(cfg => cfg.CreateMap() .ForMember(dest => dest.Value, opt => opt.MapFrom(sourceMember))); var mapper = new Mapper(config); @@ -560,7 +560,7 @@ public void SupportsParameterizationInQuery() // so that we can declare a parameter (userId) that is independent of mapping and query definition. // that way, in the query, we have a parameter which needs to be replaced. // (in SourceInjectedQueryProvider.ConvertDestinationExpressionToSourceExpression) - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { // parameter defined in mapping part long userId = default(long); @@ -611,7 +611,7 @@ public void Shoud_convert_type_changes() //[Fact(Skip="Conventions not available like this.")] //public void Shoud_work_with_conventions() //{ - // //var mapper = new MapperConfiguration(cfg => cfg.AddConditionalObjectMapper() + // //var mapper = ConfigurationHelper.GetMapperConfiguration(cfg => cfg.AddConditionalObjectMapper() // // .Where((s, d) => s.Name == d.Name + "Model" || s.Name + "Model" == d.Name)).CreateMapper(); @@ -642,7 +642,7 @@ public void Should_dispose_enumerator_when_arbitrary_projection_is_enumerated() private static IMapper SetupAutoMapper() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.CreateMap() .ForMember(d => d.Id, opt => opt.MapFrom(s => s.UserId)) diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithCustomExpressions.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithCustomExpressions.cs index 28ca63b..5792f5e 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithCustomExpressions.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithCustomExpressions.cs @@ -45,7 +45,7 @@ public void Map_member_init_using_custom_expressions() } MapperConfiguration GetConfiguration() - => new + => ConfigurationHelper.GetMapperConfiguration ( cfg => { diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithPropertiesInBaseClass.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithPropertiesInBaseClass.cs index 0d768f2..2001408 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithPropertiesInBaseClass.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingMemberInitWithPropertiesInBaseClass.cs @@ -175,7 +175,7 @@ public void Map_member_init_without_include_members_and_including_nested_members } MapperConfiguration GetConfigurationWiithoutIncludeMembers() - => new MapperConfiguration(cfg => + => ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -191,7 +191,7 @@ MapperConfiguration GetConfigurationWiithoutIncludeMembers() }); MapperConfiguration GetConfigurationWiithIncludeMembers() - => new MapperConfiguration(cfg => + => ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingWithIncludeMembersConfigurations.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingWithIncludeMembersConfigurations.cs index 79f825e..4e126be 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingWithIncludeMembersConfigurations.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MappingWithIncludeMembersConfigurations.cs @@ -175,7 +175,7 @@ public void Map_member_init_without_include_members_and_including_nested_members } MapperConfiguration GetConfigurationWiithoutIncludeMembers() - => new MapperConfiguration(cfg => + => ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -191,7 +191,7 @@ MapperConfiguration GetConfigurationWiithoutIncludeMembers() }); MapperConfiguration GetConfigurationWiithIncludeMembers() - => new MapperConfiguration(cfg => + => ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MemberMappingsOfLiteralParentTypesMustMatch.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MemberMappingsOfLiteralParentTypesMustMatch.cs index 27b7a4d..a652514 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MemberMappingsOfLiteralParentTypesMustMatch.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/MemberMappingsOfLiteralParentTypesMustMatch.cs @@ -79,7 +79,7 @@ public void MappingMemberOfNonNullableParentToMemberOfNullableParentWorksUsingCu private static IMapper GetMapper() { - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap(); }); @@ -89,7 +89,7 @@ private static IMapper GetMapper() private static IMapper GetMapperWithCustomExpressions() { - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ForMember(d => d.DateTime, o => o.MapFrom(s => s.DateTime.Value)) diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ParameterizedQueriesTestsAsDataSource.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ParameterizedQueriesTestsAsDataSource.cs index aee8eb0..97c8a7d 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ParameterizedQueriesTestsAsDataSource.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ParameterizedQueriesTestsAsDataSource.cs @@ -21,7 +21,7 @@ public class Dest public int Value { get; set; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { int value = 0; @@ -69,7 +69,7 @@ public class Dest public int Value { get; set; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { int value = 0; @@ -134,7 +134,7 @@ public DB() public IQueryable Users { get; } } - protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => + protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg => { DB db = null; diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldOnlyMapExistingTypeMaps.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldOnlyMapExistingTypeMaps.cs index 04dcebb..3cb00a0 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldOnlyMapExistingTypeMaps.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldOnlyMapExistingTypeMaps.cs @@ -11,7 +11,7 @@ public class ShouldOnlyMapExistingTypeMaps [Fact] public void Issue85() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); @@ -37,7 +37,7 @@ public void Issue85() [Fact] public void Issue93() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldUseDeclaringTypeForInstanceMethodCalls.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldUseDeclaringTypeForInstanceMethodCalls.cs index 6d6ecaf..6db6f2c 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldUseDeclaringTypeForInstanceMethodCalls.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldUseDeclaringTypeForInstanceMethodCalls.cs @@ -12,7 +12,7 @@ public class ShouldUseDeclaringTypeForInstanceMethodCalls public void MethodInfoShouldRetainDeclaringTypeInMappedExpression() { //Arrange - var config = new MapperConfiguration + var config = ConfigurationHelper.GetMapperConfiguration ( cfg => { diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.ForPath.Tests.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.ForPath.Tests.cs index 98b186c..c0050e0 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.ForPath.Tests.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.ForPath.Tests.cs @@ -150,7 +150,7 @@ private void SetupQueryableCollection() private void SetupAutoMapper() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.AddMaps(typeof(ForPathCustomerProfile)); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs index 5196188..0ca9286 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs @@ -14,7 +14,7 @@ public class XpressionMapperStructsTests public void Can_map_value_types_constants_with_instance_methods() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -44,7 +44,7 @@ public void Can_map_value_types_constants_with_instance_methods() public void Can_convert_return_type() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -74,7 +74,7 @@ public void Can_convert_return_type() public void Replace_operator_when_operands_change() { // Arrange - var config = new MapperConfiguration(cfg => { + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap().ReverseMap(); }); @@ -94,7 +94,7 @@ public void Replace_operator_when_operands_change() public void Can_map_local_variable_in_filter() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -119,7 +119,7 @@ public void Can_map_local_variable_in_filter() public void Can_map_child_property_of_local_variable_in_filter() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -144,7 +144,7 @@ public void Can_map_child_property_of_local_variable_in_filter() public void Can_map_listeral_child_property_of_local_variable_in_filter() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -170,7 +170,7 @@ public void Can_map_listeral_child_property_of_local_variable_in_filter() public void Ignore_member_expressions_where_type_is_literal_and_node_type_is_constant() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ReverseMap() @@ -197,7 +197,7 @@ public void Ignore_member_expressions_where_type_is_literal_and_node_type_is_con public void Can_map_local_variable_literal_in_filter() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ForMember(dest => dest.CreateDate, opts => opts.MapFrom(x => x.Date)); @@ -223,7 +223,7 @@ public void Can_map_local_variable_literal_in_filter() public void Can_map_local_variable_nullable_in_filter() { // Arrange - var config = new MapperConfiguration(c => + var config = ConfigurationHelper.GetMapperConfiguration(c => { c.CreateMap() .ForMember(dest => dest.CreateDate, opts => opts.MapFrom(x => x.Date)); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs index 244d0f8..2195d56 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs @@ -327,7 +327,7 @@ public void Map_object_when_null_values_are_typed() public void Map_expression_should_throws_exception_when_mapping_is_missed() { // Arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -352,7 +352,7 @@ public void Map_expression_should_throws_exception_when_mapping_is_missed() public void Map_expression_should_throws_exception_when_mapping_for_property_is_missed() { // Arrange - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.CreateMap(); @@ -1041,7 +1041,7 @@ public void Can_map_expression_with_multiple_destination_parameters_of_the_same_ private static void SetupAutoMapper() { - var config = new MapperConfiguration(cfg => + var config = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.AddMaps(typeof(OrganizationProfile));