Update testcases;

dotnetcore · Jan 21, 2024 · 42f546f · 42f546f
1 parent c3f27df
commit 42f546f
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 40 deletions.
diff --git a/test/AgileConfig.Server.ServiceTests/EnsureTablesTests.cs b/test/AgileConfig.Server.ServiceTests/EnsureTablesTests.cs
@@ -6,7 +6,7 @@
 using FreeSql;
 using AgileConfig.Server.Data.Entity;
 
-namespace AgileConfig.Server.Data.Freesql.Tests
+namespace AgileConfig.Server.ServiceTests
 {
     [TestClass()]
     public class EnsureTablesTests
@@ -17,7 +17,7 @@ public void ExistTableSqliteTest()
             //sqlite
             string conn = "Data Source=agile_config.db";
             var sqllite_fsq = new FreeSqlBuilder()
-                          .UseConnectionString(FreeSql.DataType.Sqlite, conn)
+                          .UseConnectionString(DataType.Sqlite, conn)
                           .Build();
             FluentApi.Config(sqllite_fsq);
             sqllite_fsq.Ado.ExecuteNonQuery("drop table agc_app");
@@ -34,7 +34,7 @@ public void ExistTableSqlServerTest()
             //SqlServer
             string conn = "TrustServerCertificate=True;Persist Security Info = False; User ID =dev; Password =dev; Initial Catalog =agile_config_test; Server =.";
             var sqlserver_fsq = new FreeSqlBuilder()
-                          .UseConnectionString(FreeSql.DataType.SqlServer, conn)
+                          .UseConnectionString(DataType.SqlServer, conn)
                           .Build();
             FluentApi.Config(sqlserver_fsq);
             sqlserver_fsq.Ado.ExecuteNonQuery("drop table agc_app");
@@ -51,7 +51,7 @@ public void ExistTableMysqlTest()
             //SqlServer
             string conn = "Database=agile_config_test;Data Source=192.168.0.125;User Id=root;Password=x;port=13306";
             var mysql_fsq = new FreeSqlBuilder()
-                          .UseConnectionString(FreeSql.DataType.MySql, conn)
+                          .UseConnectionString(DataType.MySql, conn)
                           .Build();
             FluentApi.Config(mysql_fsq);
             try
@@ -75,7 +75,7 @@ public void ExistTableOracleTest()
             //SqlServer
             string conn = "user id=CLINIC;password=CLINIC;data source=192.168.0.91/orcl";
             var oracle_fsq = new FreeSqlBuilder()
-                          .UseConnectionString(FreeSql.DataType.Oracle, conn)
+                          .UseConnectionString(DataType.Oracle, conn)
                           .Build();
             FluentApi.Config(oracle_fsq);
             oracle_fsq.Ado.ExecuteNonQuery("drop table \"agc_app\" ");
@@ -92,7 +92,7 @@ public void ExistTablePostgreSqlTest()
             //SqlServer
             string conn = "Host=192.168.0.125;Port=15432;Database=agileconfig;Username=postgres;Password=123456";
             var postgresql_fsq = new FreeSqlBuilder()
-                          .UseConnectionString(FreeSql.DataType.PostgreSQL, conn)
+                          .UseConnectionString(DataType.PostgreSQL, conn)
                           .Build();
             FluentApi.Config(postgresql_fsq);
             postgresql_fsq.Ado.ExecuteNonQuery("drop table \"agc_app\" ");

diff --git a/test/AgileConfig.Server.ServiceTests/PostgreSQL/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/PostgreSQL/AppServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.PostgreSQL
+namespace AgileConfig.Server.ServiceTests.PostgreSQL
 {
     [TestClass()]
     public class AppServiceTests_pg : AppServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/PostgreSQL/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/PostgreSQL/ConfigServiceTests.cs
@@ -1,7 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using AgileConfig.Server.ServiceTests.sqlite;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 
-namespace AgileConfig.Server.Service.Tests.PostgreSQL
+namespace AgileConfig.Server.ServiceTests.PostgreSQL
 {
     [TestClass()]
     public class ConfigServiceTests_pg: ConfigServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/PostgreSQL/ServerNodeServiceTests.cs b/test/AgileConfig.Server.ServiceTests/PostgreSQL/ServerNodeServiceTests.cs
@@ -2,17 +2,9 @@
 using AgileConfig.Server.Service;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using AgileConfig.Server.Data.Freesql;
-using FreeSql;
-using AgileConfig.Server.Data.Entity;
-using System.Threading.Tasks;
-using AgileConfig.Server.Data.Repository.Freesql;
-using AgileConfig.Server.IService;
-using Microsoft.Extensions.DependencyInjection;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.PostgreSQL
+namespace AgileConfig.Server.ServiceTests.PostgreSQL
 {
     [TestClass()]
     public class ServerNodeServiceTests_pg: ServerNodeServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/PostgreSQL/SettingServiceTests.cs b/test/AgileConfig.Server.ServiceTests/PostgreSQL/SettingServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.PostgreSQL
+namespace AgileConfig.Server.ServiceTests.PostgreSQL
 {
     [TestClass()]
     public class SettingServiceTests_pg : SettingServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/PostgreSQL/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/PostgreSQL/SysLogServiceTests.cs
@@ -3,7 +3,7 @@
 using AgileConfig.Server.ServiceTests.sqlite;
 using System.Collections.Generic;
 
-namespace AgileConfig.Server.Service.Tests.PostgreSQL
+namespace AgileConfig.Server.ServiceTests.PostgreSQL
 {
     [TestClass()]
     public class SysLogServiceTests_pg: SysLogServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/mysql/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/mysql/ConfigServiceTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
-using AgileConfig.Server.Service.Tests;
+using AgileConfig.Server.ServiceTests.sqlite;
 
 namespace AgileConfig.Server.ServiceTests.mysql
 {

diff --git a/test/AgileConfig.Server.ServiceTests/oracle/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/oracle/AppServiceTests.cs
@@ -1,10 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using AgileConfig.Server.Service;
 using System;
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.oracle
+namespace AgileConfig.Server.ServiceTests.oracle
 {
     [TestClass()]
     public class AppServiceTests_oracle : AppServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/oracle/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/oracle/ConfigServiceTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using AgileConfig.Server.Service.Tests;
 using System.Collections.Generic;
+using AgileConfig.Server.ServiceTests.sqlite;
 
 namespace AgileConfig.Server.ServiceTests.oracle
 {

diff --git a/test/AgileConfig.Server.ServiceTests/oracle/ServerNodeServiceTests.cs b/test/AgileConfig.Server.ServiceTests/oracle/ServerNodeServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.oracle
+namespace AgileConfig.Server.ServiceTests.oracle
 {
     [TestClass()]
     public class ServerNodeServiceTests_oracle: ServerNodeServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/oracle/SettingServiceTests.cs b/test/AgileConfig.Server.ServiceTests/oracle/SettingServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.oracle
+namespace AgileConfig.Server.ServiceTests.oracle
 {
     [TestClass()]
     public class SettingServiceTests_oracle : SettingServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/oracle/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/oracle/SysLogServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.oracle
+namespace AgileConfig.Server.ServiceTests.oracle
 {
     [TestClass()]
     public class SysLogServiceTests_oracle : SysLogServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/BasicTestService.cs b/test/AgileConfig.Server.ServiceTests/sqlite/BasicTestService.cs
@@ -2,6 +2,7 @@
 using AgileConfig.Server.Data.Abstraction;
 using AgileConfig.Server.Data.Freesql;
 using AgileConfig.Server.Data.Repository.Freesql;
+using AgileConfig.Server.Data.Repository.Selector;
 using AgileConfig.Server.IService;
 using AgileConfig.Server.Service;
 using Microsoft.Extensions.Caching.Memory;
@@ -43,9 +44,8 @@ public BasicTestService()
             services.AddScoped(_ => cache.Object);
             services.AddSingleton<IConfiguration>(config);
             services.AddFreeSqlFactory();
-            services.AddFreeSqlRepository();
+            services.AddRepositories();
             services.AddBusinessServices();
-            AddEnvRepositiroies(services);
 
             _serviceProvider = services.BuildServiceProvider();
             var systeminitializationService = _serviceProvider.GetService<ISystemInitializationService>();

diff --git a/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlite/ConfigServiceTests.cs
@@ -8,10 +8,9 @@
 using AgileConfig.Server.IService;
 using Microsoft.Extensions.Caching.Memory;
 using Moq;
-using AgileConfig.Server.ServiceTests.sqlite;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace AgileConfig.Server.Service.Tests
+namespace AgileConfig.Server.ServiceTests.sqlite
 {
     [TestClass()]
     public class ConfigServiceTests : BasicTestService
@@ -800,7 +799,7 @@ public async Task GetPublishedConfigsByAppIdWithInheritanced_DictionaryTest()
             _fsq.Insert(source3).ExecuteAffrows();
 
             await _service.Publish(app1.Id, new string[] { }, "", "", env);
-            await _service.Publish(app.Id, new string[] { },"", "", env);
+            await _service.Publish(app.Id, new string[] { }, "", "", env);
 
             var dict = await _service.GetPublishedConfigsByAppIdWithInheritanced_Dictionary(app.Id, env);
             Assert.IsNotNull(dict);
@@ -864,7 +863,7 @@ public async Task GetPublishedConfigsByAppIdWithInheritanced_DictionaryTest()
             app2.UpdateTime = DateTime.Now;
             app2.Type = AppType.Inheritance;
             _fsq.Insert(app2).ExecuteAffrows();
-        
+
 
             // 插入1个app 003
             _fsq.Delete<AppInheritanced>().Where("1=1").ExecuteAffrows();

diff --git a/test/AgileConfig.Server.ServiceTests/sqlserver/AppServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlserver/AppServiceTests.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.sqlserver
+namespace AgileConfig.Server.ServiceTests.sqlserver
 {
     [TestClass()]
-    public class AppServiceTests_sqlserver: AppServiceTests
+    public class AppServiceTests_sqlserver : AppServiceTests
     {
         string conn = "TrustServerCertificate=True;Persist Security Info = False; User ID =dev; Password =dev; Initial Catalog =agile_config_test; Server =.";
 

diff --git a/test/AgileConfig.Server.ServiceTests/sqlserver/ConfigServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlserver/ConfigServiceTests.cs
@@ -1,7 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using AgileConfig.Server.ServiceTests.sqlite;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 
-namespace AgileConfig.Server.Service.Tests.sqlserver
+namespace AgileConfig.Server.ServiceTests.sqlserver
 {
     [TestClass()]
     public class ConfigServiceTests_sqlserver: ConfigServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/sqlserver/ServerNodeServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlserver/ServerNodeServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.sqlserver
+namespace AgileConfig.Server.ServiceTests.sqlserver
 {
     [TestClass()]
     public class ServerNodeServiceTests_sqlserver: ServerNodeServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/sqlserver/SettingServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlserver/SettingServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.sqlserver
+namespace AgileConfig.Server.ServiceTests.sqlserver
 {
     [TestClass()]
     public class SettingServiceTests_sqlserver : SettingServiceTests

diff --git a/test/AgileConfig.Server.ServiceTests/sqlserver/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/sqlserver/SysLogServiceTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AgileConfig.Server.ServiceTests.sqlite;
 
-namespace AgileConfig.Server.Service.Tests.sqlserver
+namespace AgileConfig.Server.ServiceTests.sqlserver
 {
     [TestClass()]
     public class SysLogServiceTests_sqlserver : SysLogServiceTests