Update test cases;

dotnetcore · Sep 8, 2024 · 973348d · 973348d
1 parent 03d2148
commit 973348d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/test/AgileConfig.Server.ServiceTests/mysql/ServerNodeServiceTests.cs b/test/AgileConfig.Server.ServiceTests/mysql/ServerNodeServiceTests.cs
@@ -32,6 +32,8 @@ public override void ClearData()
             var sql = this.GetFreeSql();
 
             sql.Delete<ServerNode>().Where("1=1").ExecuteAffrows();
+
+            sql.Dispose();
         }
 
 

diff --git a/test/AgileConfig.Server.ServiceTests/mysql/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/mysql/SysLogServiceTests.cs
@@ -34,6 +34,8 @@ public override void ClearData()
             var sql =  this.GetFreeSql();
 
             sql.Delete<SysLog>().Where("1=1").ExecuteAffrows();
+
+            sql.Dispose();
         }
 
 

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/AppServiceTests.cs
@@ -66,12 +66,11 @@ public virtual async Task<ServiceProvider> NewGlobalSp()
         public async Task TestInitialize()
         {
             this.GlobalServiceProvider = await NewGlobalSp();
-
-            ClearData();
-
             _serviceScope = this.GlobalServiceProvider.CreateScope();
             _serviceProvider = _serviceScope.ServiceProvider;
 
+            ClearData();
+
             var systeminitializationService = _serviceProvider.GetService<ISystemInitializationService>();
             systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD
             systeminitializationService.TryInitJwtSecret();//初始化 jwt secret

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/BasicTestService.cs b/test/AgileConfig.Server.ServiceTests/sqlite/BasicTestService.cs
@@ -48,6 +48,8 @@ public virtual void ClearData()
             fsq.Delete<ConfigPublished>().Where("1=1").ExecuteAffrows();
             //fsq.Delete<Setting>().Where("1=1").ExecuteAffrows();
             fsq.Delete<SysLog>().Where("1=1").ExecuteAffrows();
+
+            fsq.Dispose();
         }
 
         public BasicTestService()

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs
@@ -36,14 +36,12 @@ public override Task<Dictionary<string, string>> GetConfigurationData()
         public async Task TestInitialize()
         {
             await NewGloablSp();
-
-            ClearData();
-
             _serviceScope = this.GlobalServiceProvider.CreateScope();
             _serviceProvider = this.GlobalServiceProvider.CreateScope().ServiceProvider;
+
+            ClearData();
 
             _service = this._serviceProvider.GetService<IConfigService>();
-
             var systeminitializationService = this._serviceProvider.GetService<ISystemInitializationService>();
             systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD
             systeminitializationService.TryInitJwtSecret();//初始化 jwt secret

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/SettingServiceTests.cs
@@ -38,12 +38,11 @@ public override Task<Dictionary<string, string>> GetConfigurationData()
         public async Task TestInitialize()
         {
             await NewGlobalSp();
-
-            ClearData();
-
             _serviceScope = GlobalServiceProvider.CreateScope();
             _serviceProvider = _serviceScope.ServiceProvider;
 
+            ClearData();
+
             var systeminitializationService = _serviceProvider.GetService<ISystemInitializationService>();
             systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD
             systeminitializationService.TryInitJwtSecret();//初始化 jwt secret

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/SysLogServiceTests.cs
@@ -39,12 +39,11 @@ public override Task<Dictionary<string, string>> GetConfigurationData()
         public async Task TestInitialize()
         {
             await NewGlobalSp();
-
-            ClearData();
-
             _serviceScope = GlobalServiceProvider.CreateScope();
             _serviceProvider = _serviceScope.ServiceProvider;
 
+            ClearData();
+
             var systeminitializationService = _serviceProvider.GetService<ISystemInitializationService>();
             systeminitializationService.TryInitDefaultEnvironment();//初始化环境 DEV TEST STAGE PROD
             systeminitializationService.TryInitJwtSecret();//初始化 jwt secret
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,8 @@ public override void ClearData() @@
                 var sql = this.GetFreeSql();
                 sql.Delete<ServerNode>().Where("1=1").ExecuteAffrows();
+                sql.Dispose();
             }
@@ Expand Down @@