From 6bb8f67e343b399913b03ec9cd7cea69c8d6106f Mon Sep 17 00:00:00 2001
From: WangJunZzz <510423039@qq.com>
Date: Sun, 15 May 2022 18:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0Freesql=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbpProFreeSqlRepositoryTestModule.cs      | 49 ++++++++++---------
 ...Lion.AbpPro.FreeSqlRepository.Tests.csproj |  2 +-
 .../AbpProTestBaseModule.cs                   |  2 +-
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/AbpProFreeSqlRepositoryTestModule.cs b/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/AbpProFreeSqlRepositoryTestModule.cs
index dc65b4f6..86c96baa 100644
--- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/AbpProFreeSqlRepositoryTestModule.cs
+++ b/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/AbpProFreeSqlRepositoryTestModule.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Linq;
-using Lion.AbpPro.EntityFrameworkCore;
+using Lion.AbpPro.EntityFrameworkCore;
 using Lion.AbpPro.FreeSqlRepository;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore;
@@ -17,51 +14,55 @@ namespace Lion.AbpPro.FreeSqlReppsitory.Tests;
 
 [DependsOn(
     typeof(AbpProTestBaseModule),
-    typeof(AbpProEntityFrameworkCoreTestModule),
+    typeof(AbpProEntityFrameworkCoreModule),
+    typeof(AbpEntityFrameworkCoreSqliteModule),
     typeof(AbpProFreeSqlModule)
 )]
 public class AbpProFreeSqlRepositoryTestModule : AbpModule
 {
-    private const string ConnectionString = "Data Source=:memory:";
     private SqliteConnection _sqliteConnection;
-
+    private const string ConnectionString = "Data Source=:memory:";
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-       
         var freeSql = new FreeSql.FreeSqlBuilder()
             .UseConnectionString(FreeSql.DataType.Sqlite, ConnectionString)
             .UseAutoSyncStructure(true)
             .Build();
         context.Services.AddSingleton<IFreeSql>(freeSql);
-        var connection = new SqliteConnection(ConnectionString);
-        ConfigureInMemorySqlite(context.Services, freeSql);
+        ConfigureInMemorySqlite(context.Services,freeSql);
+  
     }
 
-
-    private void ConfigureInMemorySqlite(IServiceCollection services, IFreeSql freeSql)
+    private void ConfigureInMemorySqlite(IServiceCollection services,IFreeSql freeSql)
     {
         _sqliteConnection = CreateDatabaseAndGetConnection(freeSql);
 
-        //services.Configure<AbpDbContextOptions>(options =>
-        //{
-        //    options.PreConfigure<AbpProDbContext>(options => { options.DbContextOptions.UseBatchEF_Sqlite(); });
-        //    options.Configure(context => { context.DbContextOptions.UseSqlite(_sqliteConnection); });
-        //});
+        services.Configure<AbpDbContextOptions>(options =>
+        {
+            options.PreConfigure<AbpProDbContext>(options =>
+            {
+                options.DbContextOptions.UseBatchEF_Sqlite();
+            });
+            options.Configure(context =>
+            {
+                context.DbContextOptions.UseSqlite(_sqliteConnection);
+            });
+        });
     }
 
     public override void OnApplicationShutdown(ApplicationShutdownContext context)
     {
-        // _sqliteConnection.Dispose();
+        _sqliteConnection.Dispose();
     }
 
     private static SqliteConnection CreateDatabaseAndGetConnection(IFreeSql freeSql)
     {
         var connection = new SqliteConnection(ConnectionString);
-         //connection.Open();
+        connection.Open();
 
         var options = new DbContextOptionsBuilder<AbpProDbContext>()
-             .UseSqlite(connection)
-             .Options;
+            .UseSqlite(connection)
+            .Options;
 
         using (var context = new AbpProDbContext(options))
         {
@@ -69,10 +70,10 @@ public class AbpProFreeSqlRepositoryTestModule : AbpModule
             {
                 freeSql.CodeFirst.SyncStructure(entityType.ClrType, entityType.GetTableName(), true);
             }
-
-            //context.GetService<IRelationalDatabaseCreator>().CreateTables();
+            context.GetService<IRelationalDatabaseCreator>().CreateTables();
         }
-        
+
         return connection;
     }
+    
 }
\ No newline at end of file
diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/Lion.AbpPro.FreeSqlRepository.Tests.csproj b/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/Lion.AbpPro.FreeSqlRepository.Tests.csproj
index dabe9e51..22ef98f7 100644
--- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/Lion.AbpPro.FreeSqlRepository.Tests.csproj
+++ b/aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/Lion.AbpPro.FreeSqlRepository.Tests.csproj
@@ -16,8 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\src\Lion.AbpPro.EntityFrameworkCore\Lion.AbpPro.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\src\Lion.AbpPro.FreeSqlRepository\Lion.AbpPro.FreeSqlRepository.csproj" />
-        <ProjectReference Include="..\Lion.AbpPro.EntityFrameworkCore.Tests\Lion.AbpPro.EntityFrameworkCore.Tests.csproj" />
         <ProjectReference Include="..\Lion.AbpPro.TestBase\Lion.AbpPro.TestBase.csproj" />
     </ItemGroup>
 
diff --git a/aspnet-core/services/test/Lion.AbpPro.TestBase/AbpProTestBaseModule.cs b/aspnet-core/services/test/Lion.AbpPro.TestBase/AbpProTestBaseModule.cs
index 88a4ddd3..05833854 100644
--- a/aspnet-core/services/test/Lion.AbpPro.TestBase/AbpProTestBaseModule.cs
+++ b/aspnet-core/services/test/Lion.AbpPro.TestBase/AbpProTestBaseModule.cs
@@ -43,7 +43,7 @@ namespace Lion.AbpPro
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
-            //SeedTestData(context);
+            SeedTestData(context);
         }
 
         private static void SeedTestData(ApplicationInitializationContext context)