From a73eede185c32819e2139a8f751c9a469b86a659 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Tue, 5 Oct 2021 13:21:03 +0300
Subject: [PATCH] Fixed AdministrationService test projects compilation errors

---
 ...onService.EntityFrameworkCore.Tests.csproj |  1 +
 ...ionServiceEntityFrameworkCoreTestModule.cs |  6 ++---
 .../AdministrationServiceTestBaseModule.cs    | 25 -------------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
index 9db9747a..1756f85f 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
+++ b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0" />
   </ItemGroup>
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreTestModule.cs b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreTestModule.cs
index f72e3e01..019592db 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreTestModule.cs
+++ b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreTestModule.cs
@@ -11,7 +11,7 @@ using Volo.Abp.Modularity;
 namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(AdministrationServiceEntityFrameworkCoreDbMigrationsModule),
+        typeof(AdministrationServiceEntityFrameworkCoreModule),
         typeof(AdministrationServiceTestBaseModule),
         typeof(AbpEntityFrameworkCoreSqliteModule)
         )]
@@ -47,11 +47,11 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
             var connection = new SqliteConnection("Data Source=:memory:");
             connection.Open();
 
-            var options = new DbContextOptionsBuilder<AdministrationServiceMigrationsDbContext>()
+            var options = new DbContextOptionsBuilder<AdministrationServiceDbContext>()
                 .UseSqlite(connection)
                 .Options;
 
-            using (var context = new AdministrationServiceMigrationsDbContext(options))
+            using (var context = new AdministrationServiceDbContext(options))
             {
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
             }
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/AdministrationServiceTestBaseModule.cs b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/AdministrationServiceTestBaseModule.cs
index 6eadf150..9c49a5a3 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/AdministrationServiceTestBaseModule.cs
+++ b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/AdministrationServiceTestBaseModule.cs
@@ -2,9 +2,7 @@
 using Volo.Abp;
 using Volo.Abp.Authorization;
 using Volo.Abp.Autofac;
-using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Data;
-using Volo.Abp.IdentityServer;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
 
@@ -18,29 +16,6 @@ namespace EShopOnAbp.AdministrationService
         )]
     public class AdministrationServiceTestBaseModule : AbpModule
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            PreConfigure<AbpIdentityServerBuilderOptions>(options =>
-            {
-                options.AddDeveloperSigningCredential = false;
-            });
-
-            PreConfigure<IIdentityServerBuilder>(identityServerBuilder =>
-            {
-                identityServerBuilder.AddDeveloperSigningCredential(false, System.Guid.NewGuid().ToString());
-            });
-        }
-
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpBackgroundJobOptions>(options =>
-            {
-                options.IsJobExecutionEnabled = false;
-            });
-
-            context.Services.AddAlwaysAllowAuthorization();
-        }
-
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             SeedTestData(context);