Converted tests to .netcoreapp1.1.

hikalkan · hikalkan · commit 6b99218c7796 · 2017-04-25T16:14:32.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/Dto/CreateTenantInput.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/Dto/CreateTenantInput.cs
@@ -1,8 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Abp.Authorization.Users;
 using Abp.AutoMapper;
 using Abp.MultiTenancy;
-using AbpCompanyName.AbpProjectName.Authorization.Users;
-using AbpCompanyName.AbpProjectName.Users;
 
 namespace AbpCompanyName.AbpProjectName.MultiTenancy.Dto
 {
@@ -19,7 +18,7 @@ public class CreateTenantInput
         public string Name { get; set; }
 
         [Required]
-        [StringLength(User.MaxEmailAddressLength)]
+        [StringLength(AbpUserBase.MaxEmailAddressLength)]
         public string AdminEmailAddress { get; set; }
 
         [MaxLength(AbpTenantBase.MaxConnectionStringLength)]
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs
@@ -42,17 +42,16 @@ public TenantAppService(
         public ListResultDto<TenantListDto> GetTenants()
         {
             return new ListResultDto<TenantListDto>(
-                _tenantManager.Tenants
-                    .OrderBy(t => t.TenancyName)
-                    .ToList()
-                    .MapTo<List<TenantListDto>>()
-                );
+                ObjectMapper.Map<List<TenantListDto>>(
+                    _tenantManager.Tenants.OrderBy(t => t.TenancyName).ToList()
+                )
+            );
         }
 
         public async Task CreateTenant(CreateTenantInput input)
         {
             //Create tenant
-            var tenant = input.MapTo<Tenant>();
+            var tenant = ObjectMapper.Map<Tenant>(input);
             tenant.ConnectionString = input.ConnectionString.IsNullOrEmpty()
                 ? null
                 : SimpleStringCipher.Instance.Encrypt(input.ConnectionString);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs
@@ -1,6 +1,5 @@
 ﻿using System.Threading.Tasks;
 using Abp.Auditing;
-using Abp.Authorization;
 using Abp.AutoMapper;
 using AbpCompanyName.AbpProjectName.Sessions.Dto;
 
@@ -22,12 +21,12 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations
 
             if (AbpSession.TenantId.HasValue)
             {
-                output.Tenant = (await GetCurrentTenantAsync()).MapTo<TenantLoginInfoDto>();
+                output.Tenant = ObjectMapper.Map<TenantLoginInfoDto>(await GetCurrentTenantAsync());
             }
 
             if (AbpSession.UserId.HasValue)
             {
-                output.User = (await GetCurrentUserAsync()).MapTo<UserLoginInfoDto>();
+                output.User = ObjectMapper.Map<UserLoginInfoDto>(await GetCurrentUserAsync());
             }
 
             return output;
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs
@@ -49,13 +49,13 @@ public async Task<ListResultDto<UserListDto>> GetUsers()
             var users = await _userRepository.GetAllListAsync();
 
             return new ListResultDto<UserListDto>(
-                users.MapTo<List<UserListDto>>()
+                ObjectMapper.Map<List<UserListDto>>(users)
                 );
         }
 
         public async Task CreateUser(CreateUserInput input)
         {
-            var user = input.MapTo<User>();
+            var user = ObjectMapper.Map<User>(input);
 
             user.TenantId = AbpSession.TenantId;
             user.Password = _passwordHasher.HashPassword(user, input.Password);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs
@@ -72,7 +72,7 @@ public async Task<AuthenticateResultModel> Authenticate([FromBody] AuthenticateM
         [HttpGet]
         public List<ExternalLoginProviderInfoModel> GetExternalAuthenticationProviders()
         {
-            return _externalAuthConfiguration.Providers.MapTo<List<ExternalLoginProviderInfoModel>>();
+            return ObjectMapper.Map<List<ExternalLoginProviderInfoModel>>(_externalAuthConfiguration.Providers);
         }
 
         [HttpPost]
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -13,17 +13,18 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
+    <ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="NSubstitute" Version="2.0.2" />
     <PackageReference Include="Shouldly" Version="2.8.2" />
-    <PackageReference Include="Effort.EF6" Version="1.3.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="Abp.TestBase" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs
@@ -1,108 +1,53 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 using Abp;
-using Abp.Configuration.Startup;
-using Abp.Domain.Uow;
+using Abp.Authorization.Users;
+using Abp.Events.Bus;
+using Abp.Events.Bus.Entities;
 using Abp.Runtime.Session;
 using Abp.TestBase;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
-using AbpCompanyName.AbpProjectName.EntityFramework;
-using AbpCompanyName.AbpProjectName.Migrations.SeedData;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed.Host;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed.Tenants;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using Castle.MicroKernel.Registration;
-using Effort;
-using EntityFramework.DynamicFilters;
+using Microsoft.EntityFrameworkCore;
 
 
 namespace AbpCompanyName.AbpProjectName.Tests
 {
     public abstract class AbpProjectNameTestBase : AbpIntegratedTestBase<AbpProjectNameTestModule>
     {
-        private DbConnection _hostDb;
-        private Dictionary<int, DbConnection> _tenantDbs; //only used for db per tenant architecture
-
         protected AbpProjectNameTestBase()
         {
+            void NormalizeDbContext(AbpProjectNameDbContext context)
+            {
+                context.EntityChangeEventHelper = NullEntityChangeEventHelper.Instance;
+                context.EventBus = NullEventBus.Instance;
+                context.SuppressAutoSetTenantId = true;
+            }
+
             //Seed initial data for host
             AbpSession.TenantId = null;
             UsingDbContext(context =>
             {
+                NormalizeDbContext(context);
                 new InitialHostDbBuilder(context).Create();
-                new DefaultTenantCreator(context).Create();
+                new DefaultTenantBuilder(context).Create();
             });
 
             //Seed initial data for default tenant
             AbpSession.TenantId = 1;
             UsingDbContext(context =>
             {
+                NormalizeDbContext(context);
                 new TenantRoleAndUserBuilder(context, 1).Create();
             });
 
             LoginAsDefaultTenantAdmin();
         }
 
-        protected override void PreInitialize()
-        {
-            base.PreInitialize();
-
-            /* You can switch database architecture here: */
-            UseSingleDatabase();
-            //UseDatabasePerTenant();
-        }
-
-        /* Uses single database for host and all tenants.
-         */
-        private void UseSingleDatabase()
-        {
-            _hostDb = DbConnectionFactory.CreateTransient();
-
-            LocalIocManager.IocContainer.Register(
-                Component.For<DbConnection>()
-                    .UsingFactoryMethod(() => _hostDb)
-                    .LifestyleSingleton()
-                );
-        }
-
-        /* Uses single database for host and Default tenant,
-         * but dedicated databases for all other tenants.
-         */
-        private void UseDatabasePerTenant()
-        {
-            _hostDb = DbConnectionFactory.CreateTransient();
-            _tenantDbs = new Dictionary<int, DbConnection>();
-
-            LocalIocManager.IocContainer.Register(
-                Component.For<DbConnection>()
-                    .UsingFactoryMethod((kernel) =>
-                    {
-                        lock (_tenantDbs)
-                        {
-                            var currentUow = kernel.Resolve<ICurrentUnitOfWorkProvider>().Current;
-                            var abpSession = kernel.Resolve<IAbpSession>();
-
-                            var tenantId = currentUow != null ? currentUow.GetTenantId() : abpSession.TenantId;
-
-                            if (tenantId == null || tenantId == 1) //host and default tenant are stored in host db
-                            {
-                                return _hostDb;
-                            }
-
-                            if (!_tenantDbs.ContainsKey(tenantId.Value))
-                            {
-                                _tenantDbs[tenantId.Value] = DbConnectionFactory.CreateTransient();
-                            }
-
-                            return _tenantDbs[tenantId.Value];
-                        }
-                    }, true)
-                    .LifestyleTransient()
-                );
-        }
-
         #region UsingDbContext
 
         protected IDisposable UsingTenantId(int? tenantId)
@@ -138,7 +83,6 @@ protected void UsingDbContext(int? tenantId, Action<AbpProjectNameDbContext> act
             {
                 using (var context = LocalIocManager.Resolve<AbpProjectNameDbContext>())
                 {
-                    context.DisableAllFilters();
                     action(context);
                     context.SaveChanges();
                 }
@@ -151,7 +95,6 @@ protected async Task UsingDbContextAsync(int? tenantId, Func<AbpProjectNameDbCon
             {
                 using (var context = LocalIocManager.Resolve<AbpProjectNameDbContext>())
                 {
-                    context.DisableAllFilters();
                     await action(context);
                     await context.SaveChangesAsync();
                 }
@@ -166,7 +109,6 @@ protected T UsingDbContext<T>(int? tenantId, Func<AbpProjectNameDbContext, T> fu
             {
                 using (var context = LocalIocManager.Resolve<AbpProjectNameDbContext>())
                 {
-                    context.DisableAllFilters();
                     result = func(context);
                     context.SaveChanges();
                 }
@@ -183,7 +125,6 @@ protected async Task<T> UsingDbContextAsync<T>(int? tenantId, Func<AbpProjectNam
             {
                 using (var context = LocalIocManager.Resolve<AbpProjectNameDbContext>())
                 {
-                    context.DisableAllFilters();
                     result = await func(context);
                     await context.SaveChangesAsync();
                 }
@@ -198,12 +139,12 @@ protected async Task<T> UsingDbContextAsync<T>(int? tenantId, Func<AbpProjectNam
 
         protected void LoginAsHostAdmin()
         {
-            LoginAsHost(User.AdminUserName);
+            LoginAsHost(AbpUserBase.AdminUserName);
         }
 
         protected void LoginAsDefaultTenantAdmin()
         {
-            LoginAsTenant(Tenant.DefaultTenantName, User.AdminUserName);
+            LoginAsTenant(Tenant.DefaultTenantName, AbpUserBase.AdminUserName);
         }
 
         protected void LoginAsHost(string userName)
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestModule.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestModule.cs
@@ -1,9 +1,13 @@
 using System;
+using Abp.AutoMapper;
+using Abp.Dependency;
 using Abp.Modules;
-using Abp.MultiTenancy;
+using Abp.Configuration.Startup;
+using Abp.Net.Mail;
 using Abp.TestBase;
 using Abp.Zero.Configuration;
-using AbpCompanyName.AbpProjectName.EntityFramework;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
+using AbpCompanyName.AbpProjectName.Tests.DependencyInjection;
 using Castle.MicroKernel.Registration;
 using NSubstitute;
 
@@ -16,16 +20,31 @@ namespace AbpCompanyName.AbpProjectName.Tests
         )]
     public class AbpProjectNameTestModule : AbpModule
     {
+        public AbpProjectNameTestModule(AbpProjectNameEntityFrameworkModule abpProjectNameEntityFrameworkModule)
+        {
+            abpProjectNameEntityFrameworkModule.SkipDbContextRegistration = true;
+        }
+
         public override void PreInitialize()
         {
             Configuration.UnitOfWork.Timeout = TimeSpan.FromMinutes(30);
 
+            //Disable static mapper usage since it breaks unit tests (see https://github.com/aspnetboilerplate/aspnetboilerplate/issues/2052)
+            Configuration.Modules.AbpAutoMapper().UseStaticMapper = false;
+
             Configuration.BackgroundJobs.IsJobExecutionEnabled = false;
 
             //Use database for language management
             Configuration.Modules.Zero().LanguageManagement.EnableDbLocalization();
 
-            RegisterFakeService<IAbpZeroDbMigrator>();
+            RegisterFakeService<AbpZeroDbMigrator>();
+
+            Configuration.ReplaceService<IEmailSender, NullEmailSender>(DependencyLifeStyle.Transient);
+        }
+
+        public override void Initialize()
+        {
+            ServiceCollectionRegistrar.Register(IocManager);
         }
 
         private void RegisterFakeService<TService>() where TService : class
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/DependencyInjection/ServiceCollectionRegistrar.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/DependencyInjection/ServiceCollectionRegistrar.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using Abp.Dependency;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
+using AbpCompanyName.AbpProjectName.Identity;
+using Castle.MicroKernel.Registration;
+using Castle.Windsor.MsDependencyInjection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AbpCompanyName.AbpProjectName.Tests.DependencyInjection
+{
+    public static class ServiceCollectionRegistrar
+    {
+        public static void Register(IIocManager iocManager)
+        {
+            var services = new ServiceCollection();
+
+            IdentityRegistrar.Register(services);
+
+            services.AddEntityFrameworkInMemoryDatabase();
+
+            var serviceProvider = WindsorRegistrationHelper.CreateServiceProvider(iocManager.IocContainer, services);
+
+            var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
+            builder.UseInMemoryDatabase(Guid.NewGuid().ToString()).UseInternalServiceProvider(serviceProvider);
+
+            iocManager.IocContainer.Register(
+                Component
+                    .For<DbContextOptions<AbpProjectNameDbContext>>()
+                    .Instance(builder.Options)
+                    .LifestyleSingleton()
+            );
+        }
+    }
+}
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/Users/UserAppService_Tests.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/Users/UserAppService_Tests.cs
@@ -1,7 +1,7 @@
-﻿using System.Data.Entity;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 using AbpCompanyName.AbpProjectName.Users;
 using AbpCompanyName.AbpProjectName.Users.Dto;
+using Microsoft.EntityFrameworkCore;
 using Shouldly;
 using Xunit;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`	`using Abp.Auditing;`
`3`		`-using Abp.Authorization;`
`4`	`3`	`using Abp.AutoMapper;`
`5`	`4`	`using AbpCompanyName.AbpProjectName.Sessions.Dto;`
`6`	`5`
`@@ -22,12 +21,12 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations`
`22`	`21`
`23`	`22`	`if (AbpSession.TenantId.HasValue)`
`24`	`23`	`{`
`25`		`- output.Tenant = (await GetCurrentTenantAsync()).MapTo<TenantLoginInfoDto>();`
	`24`	`+ output.Tenant = ObjectMapper.Map<TenantLoginInfoDto>(await GetCurrentTenantAsync());`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`if (AbpSession.UserId.HasValue)`
`29`	`28`	`{`
`30`		`- output.User = (await GetCurrentUserAsync()).MapTo<UserLoginInfoDto>();`
	`29`	`+ output.User = ObjectMapper.Map<UserLoginInfoDto>(await GetCurrentUserAsync());`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`return output;`
Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,13 @@ public async Task<ListResultDto<UserListDto>> GetUsers()`
`49`	`49`	`var users = await _userRepository.GetAllListAsync();`
`50`	`50`
`51`	`51`	`return new ListResultDto<UserListDto>(`
`52`		`- users.MapTo<List<UserListDto>>()`
	`52`	`+ ObjectMapper.Map<List<UserListDto>>(users)`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public async Task CreateUser(CreateUserInput input)`
`57`	`57`	`{`
`58`		`- var user = input.MapTo<User>();`
	`58`	`+ var user = ObjectMapper.Map<User>(input);`
`59`	`59`
`60`	`60`	`user.TenantId = AbpSession.TenantId;`
`61`	`61`	`user.Password = _passwordHasher.HashPassword(user, input.Password);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public async Task<AuthenticateResultModel> Authenticate([FromBody] AuthenticateM`
`72`	`72`	`[HttpGet]`
`73`	`73`	`public List<ExternalLoginProviderInfoModel> GetExternalAuthenticationProviders()`
`74`	`74`	`{`
`75`		`- return _externalAuthConfiguration.Providers.MapTo<List<ExternalLoginProviderInfoModel>>();`
	`75`	`+ return ObjectMapper.Map<List<ExternalLoginProviderInfoModel>>(_externalAuthConfiguration.Providers);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`[HttpPost]`