remove the ad-hoc stuff

Author: lbargaoanu

src/AutoMapper/Configuration/CtorParamConfigurationExpression.cs

@@ -62,7 +62,7 @@ public void MapFrom(string sourceMembersPath)
         _ctorParamActions.Add(cpm => cpm.MapFrom(sourceMembersPath, sourceMembers));
     }
 
-    public void ExplicitExpansion(bool value = true) => _ctorParamActions.Add(cpm => cpm.ExplicitExpansion = value);
+    public void ExplicitExpansion(bool value) => _ctorParamActions.Add(cpm => cpm.ExplicitExpansion = value);
 
     public void Configure(TypeMap typeMap)
     {

src/AutoMapper/Configuration/MemberConfigurationExpression.cs

@@ -80,7 +80,7 @@ private void PreConditionCore(Expression<Func<TSource, TDestination, ResolutionC
         PropertyMapActions.Add(pm => pm.PreCondition = expr);
     public void AddTransform(Expression<Func<TMember, TMember>> transformer) =>
         PropertyMapActions.Add(pm => pm.AddValueTransformation(new ValueTransformerConfiguration(pm.DestinationType, transformer)));
-    public void ExplicitExpansion(bool value = true) => PropertyMapActions.Add(pm => pm.ExplicitExpansion = pm.ExplicitExpansion == null ? value : pm.ExplicitExpansion);
+    public void ExplicitExpansion(bool value) => PropertyMapActions.Add(pm => pm.ExplicitExpansion = value);
     public void Ignore() => Ignore(ignorePaths: true);
     public void Ignore(bool ignorePaths)
     {

src/IntegrationTests/ExplicitExpansion/DisableExplicitExpansion.cs

@@ -1,114 +1,4 @@
-using System.Text.RegularExpressions;
-
-namespace AutoMapper.IntegrationTests.ExplicitExpansion;
-
-public class DisableExplicitExpansion : IntegrationTest<DisableExplicitExpansion.DatabaseInitializer>
-{
-    public class Source
-    {   [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
-        public Int32 Desc { get; set; }
-        public String Name { get; set; }
-        public String Code { get; set; }
-    }
-    public class Dto
-    {
-        public String Name { get; set; }
-        public String Code { get; set; }
-        public Nullable<int> Desc { get; set; }
-    }
-
-    public class Context : LocalDbContext
-    {
-        public List<string> Log = new List<string>();
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            optionsBuilder.LogTo(s => Log.Add(s));
-            base.OnConfiguring(optionsBuilder);
-        }
-
-        public DbSet<Source> Sources { get; set; }
-
-        public string GetLastSelectSqlLogEntry() => Log.LastOrDefault(_ => _.Contains("SELECT"));
-    }
-
-    private static readonly IQueryable<Source> _iq = new List<Source> {
-        new Source() { Name = "Name1", Code = "Code1", Desc = -12 },
-    } .AsQueryable();
-
-    private static readonly Source _iqf = _iq.First();
-
-    public class DatabaseInitializer : DropCreateDatabaseAlways<Context>
-    {
-        protected override void Seed(Context context)
-        {
-            context.Sources.Add(_iqf);
-            base.Seed(context);
-        }
-    }
-
-    protected override MapperConfiguration CreateConfiguration() => new(cfg =>
-    {
-        cfg.CreateMap<Source, Dto>()
-            .ForMember(dto => dto.Code, conf => conf.ExplicitExpansion(false))
-            .ForAllMembers(conf => conf.ExplicitExpansion())
-            ;});
-
-    [Fact]
-    public void Should_CodeBeExpanded() {
-        using (var ctx = new Context()) {
-            var dto = ProjectTo<Dto>(ctx.Sources).ToList().First();
-            var sqlSelect = ctx.GetLastSelectSqlLogEntry();
-            sqlSelect.SqlFromShouldStartWith(nameof(ctx.Sources));
-            sqlSelect.ShouldNotContain("JOIN");
-
-            sqlSelect.SqlShouldNotSelectColumn(nameof(_iqf.Name)); dto.Name.ShouldBeNull();
-            sqlSelect.SqlShouldSelectColumn(nameof(_iqf.Code)); dto.Code.ShouldBe(_iqf.Code);
-            sqlSelect.SqlShouldNotSelectColumn(nameof(_iqf.Desc)); dto.Desc.ShouldBeNull();
-        }
-    }
-
-    [Fact]
-    public void Should_NameAndCodeBeExpanded() {
-        using (var ctx = new Context()) {
-            var dto = ProjectTo<Dto>(ctx.Sources, null, _ => _.Name).First();
-            var sqlSelect = ctx.GetLastSelectSqlLogEntry();
-            sqlSelect.SqlFromShouldStartWith(nameof(ctx.Sources));
-            sqlSelect.ShouldNotContain("JOIN");
-            
-            dto.Name.ShouldBe(_iqf.Name); sqlSelect.SqlShouldSelectColumn(nameof(_iqf.Name));
-            dto.Code.ShouldBe(_iqf.Code); sqlSelect.SqlShouldSelectColumn(nameof(_iqf.Code));
-            dto.Desc.ShouldBeNull(); sqlSelect.SqlShouldNotSelectColumn(nameof(_iqf.Desc));
-        }
-    }
-
-}
-
-public class ConstructorNoExplicitExpansion : IntegrationTest<ConstructorNoExplicitExpansion.DatabaseInitializer> {
-    public class Entity {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
-    record Dto(string Name) { }
-    public class Context : LocalDbContext {
-        public DbSet<Entity> Entities { get; set; }
-    }
-    public class DatabaseInitializer : DropCreateDatabaseAlways<Context> {
-        protected override void Seed(Context context) {
-            context.Entities.Add(new() { Name = "Name" });
-            base.Seed(context);
-        }
-    }
-    protected override MapperConfiguration CreateConfiguration() => new(c => c.CreateProjection<Entity, Dto>().ForCtorParam("Name", o => o.ExplicitExpansion(false)));
-    [Fact]
-    public void Should_work() {
-        using var context = new Context();
-        var dto = ProjectTo<Dto>(context.Entities).Single();
-        dto.Name.ShouldBe("Name");
-        dto = ProjectTo<Dto>(context.Entities, null, d => d.Name).Single();
-        dto.Name.ShouldBe("Name");
-    }
-}
+namespace AutoMapper.IntegrationTests.ExplicitExpansion;
 
 public class ConstructorWithInheritanceNoExplicitExpansion : IntegrationTest<ConstructorWithInheritanceNoExplicitExpansion.DatabaseInitializer> {
     public class Entity {
@@ -117,36 +7,32 @@ public class Entity {
     }
 
     public class SubEntity : Entity {
-        public string Caption { get; set; }
     }
 
-    record Dto(string Name) { }
-    record SubDto(string Name, string Caption) : Dto(Name) { }
+    record Dto(string Name);
+    record SubDto(string Name) : Dto(Name) { }
 
     public class Context : LocalDbContext {
-        public DbSet<SubEntity> Entities { get; set; }
+        public DbSet<Entity> Entities { get; set; }
+        public DbSet<SubEntity> SubEntities { get; set; }
     }
     public class DatabaseInitializer : DropCreateDatabaseAlways<Context> {
         protected override void Seed(Context context) {
-            context.Entities.Add(new() { Name = "Name", Caption = "Caption" });
+            context.Entities.Add(new() { Name = "base" });
+            context.SubEntities.Add(new() { Name = "derived" });
             base.Seed(context);
         }
     }
     protected override MapperConfiguration CreateConfiguration() => new(c => {
         c.CreateMap<Entity, Dto>().ForCtorParam("Name", o => o.ExplicitExpansion());
-        c.CreateMap<SubEntity, SubDto>()
-            .IncludeBase<Entity, Dto>()
-            .ForCtorParam("Name", o => o.ExplicitExpansion(false))
-            .ForCtorParam("Caption", o => o.ExplicitExpansion(false));
+        c.CreateMap<SubEntity, SubDto>().IncludeBase<Entity, Dto>().ForCtorParam("Name", o => o.ExplicitExpansion(false));
     });
     [Fact]
     public void Should_work() {
         using var context = new Context();
-        var dto = ProjectTo<SubDto>(context.Entities).Single();
-        dto.Name.ShouldBe("Name");
-        dto.Caption.ShouldBe("Caption");
-        dto = ProjectTo<SubDto>(context.Entities, null, d => d.Name, d => d.Caption).Single();
-        dto.Name.ShouldBe("Name");
-        dto.Caption.ShouldBe("Caption");
+        var dtos = ProjectTo<Dto>(context.Entities).ToList();
+        dtos.Count.ShouldBe(2);
+        dtos[0].ShouldBeOfType<Dto>().Name.ShouldBeNull();
+        dtos[1].ShouldBeOfType<SubDto>().Name.ShouldBe("derived");
     }
 }

…sion/ExpandCollectionsWithoutExplicit.cs …itExpansion/ExpandCollectionsOverride.cssrc/IntegrationTests/ExplicitExpansion/ExpandCollectionsWithoutExplicit.cs renamed to src/IntegrationTests/ExplicitExpansion/ExpandCollectionsOverride.cs src/IntegrationTests/ExplicitExpansion/ExpandCollectionsWithoutExplicit.cs renamed to src/IntegrationTests/ExplicitExpansion/ExpandCollectionsOverride.cs

@@ -1,6 +1,6 @@
 namespace AutoMapper.IntegrationTests.ExplicitExpansion;
 
-public class ExpandCollectionsWithoutExplicit : IntegrationTest<ExpandCollectionsWithoutExplicit.DatabaseInitializer>
+public class ExpandCollectionsOverride : IntegrationTest<ExpandCollectionsOverride.DatabaseInitializer>
 {
     TrainingCourseDto _course;