diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj index b540a52e01..e573755bb1 100644 --- a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj +++ b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj @@ -15,6 +15,7 @@ + diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs index b8cc03c03a..7300048891 100644 --- a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs +++ b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs @@ -1,6 +1,8 @@ +using System; using AbpDesk.EntityFrameworkCore; using AbpDesk.Tickets; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; using Volo.Abp.TestBase; namespace AbpDesk @@ -12,6 +14,18 @@ namespace AbpDesk SeedTestData(); } + //TODO: Make changing DI framework in unit tests easier. + + protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) + { + options.UseAutofac(); + } + + protected override IServiceProvider CreateServiceProvider(IServiceCollection services) + { + return services.BuildAutofacServiceProvider(); + } + protected virtual void SeedTestData() { using (var scope = ServiceProvider.CreateScope()) diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestModule.cs b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestModule.cs index 2019aec7e3..796df3eeb3 100644 --- a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestModule.cs +++ b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestModule.cs @@ -2,13 +2,15 @@ using AbpDesk.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Autofac; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; namespace AbpDesk { - [DependsOn(typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule))] + //TODO: Remove AbpAutofacModule and add it to AbpDesk application's Core module! + [DependsOn(typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule), typeof(AbpAutofacModule))] public class AbpDeskApplicationTestModule : AbpModule { public override void ConfigureServices(IServiceCollection services)