Simplify test setup

Author: Tasteful

src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingCtorTests.cs

@@ -6,25 +6,18 @@ namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
     public class EntityFrameworkCoreUsingCtorTests : EntityFramworkCoreTestsBase
     {
-        private readonly Mapper _mapper;
-
         public EntityFrameworkCoreUsingCtorTests()
         {
-            _mapper = new Mapper(new MapperConfiguration(x =>
+            mapper = new Mapper(new MapperConfiguration(x =>
             {
                 x.AddCollectionMappers();
                 x.CreateMap<ThingDto, Thing>().ReverseMap();
                 x.UseEntityFrameworkCoreModel<DB>();
             }));
 
-            mapper = GetMapper();               // needed for every test so pref to place into ctor instead of each Arrange
-            db = GetDbContext();                // XUnit will create here in ctor and Dispose() after each test
+            db = new DB();
         }
 
-        private DBContextBase GetDbContext() => new DB();
-
-        private IMapper GetMapper() => _mapper;
-
         public class DB : DBContextBase
         {
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingDITests.cs

@@ -5,10 +5,9 @@
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public class EntityFramworkCoreUsingDITests : EntityFramworkCoreTestsBase   //, IDisposable
+    public class EntityFramworkCoreUsingDITests : EntityFramworkCoreTestsBase
     {
         private readonly ServiceProvider _serviceProvider;
-        private readonly Mapper _mapper;
         private readonly IServiceScope _serviceScope;
 
         public EntityFramworkCoreUsingDITests()
@@ -21,7 +20,7 @@ public EntityFramworkCoreUsingDITests()
 
             _serviceProvider = services.BuildServiceProvider();
 
-            _mapper = new Mapper(new MapperConfiguration(x =>
+            mapper = new Mapper(new MapperConfiguration(x =>
             {
                 x.ConstructServicesUsing(type => ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, type));
                 x.AddCollectionMappers();
@@ -30,9 +29,7 @@ public EntityFramworkCoreUsingDITests()
             }));
 
             _serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope();
-
-            mapper = GetMapper();               // needed for every test so pref to place into ctor instead of each Arrange
-            db = GetDbContext();                // XUnit will create here in ctor and Dispose() after each test
+            db = _serviceScope.ServiceProvider.GetRequiredService<DB>();
         }
 
         public override void Dispose()
@@ -42,10 +39,6 @@ public override void Dispose()
             base.Dispose();
         }
 
-        private DBContextBase GetDbContext() => _serviceScope.ServiceProvider.GetRequiredService<DB>();
-
-        private IMapper GetMapper() => _mapper;
-
         public class DB : DBContextBase
         {
             public DB(DbContextOptions dbContextOptions)

src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingMicrosoftDITests.cs

@@ -6,7 +6,7 @@
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFramworkCoreTestsBase //, IDisposable
+    public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFramworkCoreTestsBase
     {
         private readonly ServiceProvider _serviceProvider;
         private readonly IServiceScope _serviceScope;
@@ -26,23 +26,20 @@ public EntityFrameworkCoreUsingMicrosoftDITests()
                 x.CreateMap<ThingDto, Thing>().ReverseMap();
             }, new Assembly[0]);
 
-            this._serviceProvider = services.BuildServiceProvider();
-            this._serviceScope = this._serviceProvider.CreateScope();
+            _serviceProvider = services.BuildServiceProvider();
+            _serviceScope = _serviceProvider.CreateScope();
 
-            mapper = GetMapper();               // needed for every test so pref to place into ctor instead of each Arrange
-            db = GetDbContext();                // XUnit will create here in ctor and Dispose() after each test
+            mapper = _serviceScope.ServiceProvider.GetRequiredService<IMapper>();
+            db = _serviceScope.ServiceProvider.GetRequiredService<DB>();
         }
 
         public override void Dispose()
         {
-            this._serviceScope?.Dispose();
-            this._serviceProvider?.Dispose();
+            _serviceScope?.Dispose();
+            _serviceProvider?.Dispose();
             base.Dispose();
         }
 
-        private DBContextBase GetDbContext() => this._serviceScope.ServiceProvider.GetRequiredService<DB>();
-
-        private IMapper GetMapper() => this._serviceScope.ServiceProvider.GetRequiredService<IMapper>();
 
         public class DB : DBContextBase
         {