From b023fa17cf4e8ea3109f05ade783d02e6bd6d644 Mon Sep 17 00:00:00 2001
From: utilcore <8907060@qq.com>
Date: Mon, 21 Aug 2017 22:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CI=20SqlServer=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnitOfWorks/SqlServerUnitOfWork.cs        |  2 +-
 .../{Confis => Configs}/AppConfig.cs          |  2 +-
 .../SqlServer/Configs/CiConfig.cs             | 46 ++++++++++++++++
 .../{Confis => Configs}/IocConfig.cs          |  2 +-
 .../SqlServer/Confis/ConnectionUtil.cs        | 54 -------------------
 .../SqlServer/Tests/CustomerRepositoryTest.cs |  2 +-
 .../SqlServer/Tests/OrderRepositoryTest.cs    |  2 +-
 .../SqlServer/Tests/ProductRepositoryTest.cs  |  2 +-
 8 files changed, 52 insertions(+), 60 deletions(-)
 rename test/Util.Datas.Tests.Integration/SqlServer/{Confis => Configs}/AppConfig.cs (89%)
 create mode 100644 test/Util.Datas.Tests.Integration/SqlServer/Configs/CiConfig.cs
 rename test/Util.Datas.Tests.Integration/SqlServer/{Confis => Configs}/IocConfig.cs (97%)
 delete mode 100644 test/Util.Datas.Tests.Integration/SqlServer/Confis/ConnectionUtil.cs

diff --git a/test/Util.Datas.Tests.Integration/Samples/Datas/SqlServer/UnitOfWorks/SqlServerUnitOfWork.cs b/test/Util.Datas.Tests.Integration/Samples/Datas/SqlServer/UnitOfWorks/SqlServerUnitOfWork.cs
index d4be4032..8e4362b5 100644
--- a/test/Util.Datas.Tests.Integration/Samples/Datas/SqlServer/UnitOfWorks/SqlServerUnitOfWork.cs
+++ b/test/Util.Datas.Tests.Integration/Samples/Datas/SqlServer/UnitOfWorks/SqlServerUnitOfWork.cs
@@ -1,4 +1,4 @@
-using Util.Datas.Tests.SqlServer.Confis;
+using Util.Datas.Tests.SqlServer.Configs;
 
 namespace Util.Datas.Tests.Samples.Datas.SqlServer.UnitOfWorks {
     /// <summary>
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Confis/AppConfig.cs b/test/Util.Datas.Tests.Integration/SqlServer/Configs/AppConfig.cs
similarity index 89%
rename from test/Util.Datas.Tests.Integration/SqlServer/Confis/AppConfig.cs
rename to test/Util.Datas.Tests.Integration/SqlServer/Configs/AppConfig.cs
index 58f950d0..2f5a6ed6 100644
--- a/test/Util.Datas.Tests.Integration/SqlServer/Confis/AppConfig.cs
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Configs/AppConfig.cs
@@ -1,4 +1,4 @@
-namespace Util.Datas.Tests.SqlServer.Confis {
+namespace Util.Datas.Tests.SqlServer.Configs {
     /// <summary>
     /// 测试应用程序配置
     /// </summary>
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Configs/CiConfig.cs b/test/Util.Datas.Tests.Integration/SqlServer/Configs/CiConfig.cs
new file mode 100644
index 00000000..90754f33
--- /dev/null
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Configs/CiConfig.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Data.SqlClient;
+using System.IO;
+
+namespace Util.Datas.Tests.SqlServer.Configs {
+    public static class CiConfig {
+        private const string DatabaseVariable = "SqlServer_DatabaseName";
+        private const string ConnectionStringTemplateVariable = "SqlServer_ConnectionStringTemplate";
+
+        private const string MasterDatabaseName = "master";
+        private const string DefaultDatabaseName = @"UtilTest";
+
+        private const string DefaultConnectionStringTemplate =
+            @"Server=.\\sql2014;Initial Catalog={0};User Id=sa;Password=sa;MultipleActiveResultSets=True";
+
+        public static string GetDatabaseName() {
+            return Environment.GetEnvironmentVariable( DatabaseVariable ) ?? DefaultDatabaseName;
+        }
+
+        public static string GetMasterConnectionString() {
+            return string.Format( GetConnectionStringTemplate(), MasterDatabaseName );
+        }
+
+        public static string GetConnectionString() {
+            return string.Format( GetConnectionStringTemplate(), GetDatabaseName() );
+        }
+
+        private static string GetConnectionStringTemplate() {
+            return
+                Environment.GetEnvironmentVariable( ConnectionStringTemplateVariable ) ??
+                DefaultConnectionStringTemplate;
+        }
+
+        public static SqlConnection CreateConnection( string connectionString = null ) {
+            connectionString = connectionString ?? GetConnectionString();
+            var connection = new SqlConnection( connectionString );
+            connection.Open();
+            return connection;
+        }
+
+        public static string GetScript() {
+            var scriptPath = Path.Combine( AppDomain.CurrentDomain.BaseDirectory, "database.sql" );
+            return File.ReadAllText( scriptPath );
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Confis/IocConfig.cs b/test/Util.Datas.Tests.Integration/SqlServer/Configs/IocConfig.cs
similarity index 97%
rename from test/Util.Datas.Tests.Integration/SqlServer/Confis/IocConfig.cs
rename to test/Util.Datas.Tests.Integration/SqlServer/Configs/IocConfig.cs
index a209ff5f..ed9eec78 100644
--- a/test/Util.Datas.Tests.Integration/SqlServer/Confis/IocConfig.cs
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Configs/IocConfig.cs
@@ -6,7 +6,7 @@ using Util.Datas.Tests.Samples.Domains.Repositories;
 using Util.DependencyInjection;
 using Util.Domains.Sessions;
 
-namespace Util.Datas.Tests.SqlServer.Confis {
+namespace Util.Datas.Tests.SqlServer.Configs {
     /// <summary>
     /// 依赖注入配置
     /// </summary>
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Confis/ConnectionUtil.cs b/test/Util.Datas.Tests.Integration/SqlServer/Confis/ConnectionUtil.cs
deleted file mode 100644
index 2500620a..00000000
--- a/test/Util.Datas.Tests.Integration/SqlServer/Confis/ConnectionUtil.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Data.SqlClient;
-using System.IO;
-
-namespace DotNetCore.CAP.SqlServer.Test
-{
-    public static class ConnectionUtil
-    {
-        private const string DatabaseVariable = "SqlServer_DatabaseName";
-        private const string ConnectionStringTemplateVariable = "SqlServer_ConnectionStringTemplate";
-
-        private const string MasterDatabaseName = "master";
-        private const string DefaultDatabaseName = @"UtilTest";
-
-        private const string DefaultConnectionStringTemplate =
-            @"Server=.\\sql2014;Initial Catalog={0};User Id=sa;Password=sa;MultipleActiveResultSets=True";
-
-        public static string GetDatabaseName()
-        {
-            return Environment.GetEnvironmentVariable(DatabaseVariable) ?? DefaultDatabaseName;
-        }
-
-        public static string GetMasterConnectionString()
-        {
-            return string.Format(GetConnectionStringTemplate(), MasterDatabaseName);
-        }
-
-        public static string GetConnectionString()
-        {
-            return string.Format(GetConnectionStringTemplate(), GetDatabaseName());
-        }
-
-        private static string GetConnectionStringTemplate()
-        {
-            return
-                Environment.GetEnvironmentVariable(ConnectionStringTemplateVariable) ??
-                DefaultConnectionStringTemplate;
-        }
-
-        public static SqlConnection CreateConnection(string connectionString = null)
-        {
-            connectionString = connectionString ?? GetConnectionString();
-            var connection = new SqlConnection(connectionString);
-            connection.Open();
-            return connection;
-        }
-
-        public static string GetScript()
-        {
-            var scriptPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "database.sql");
-            return File.ReadAllText(scriptPath);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Tests/CustomerRepositoryTest.cs b/test/Util.Datas.Tests.Integration/SqlServer/Tests/CustomerRepositoryTest.cs
index 97a75547..beefa510 100644
--- a/test/Util.Datas.Tests.Integration/SqlServer/Tests/CustomerRepositoryTest.cs
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Tests/CustomerRepositoryTest.cs
@@ -8,7 +8,7 @@ using Util.Datas.Tests.Samples.Datas.Criterias;
 using Util.Datas.Tests.Samples.Datas.SqlServer.UnitOfWorks;
 using Util.Datas.Tests.Samples.Domains.Models;
 using Util.Datas.Tests.Samples.Domains.Repositories;
-using Util.Datas.Tests.SqlServer.Confis;
+using Util.Datas.Tests.SqlServer.Configs;
 using Util.Helpers;
 using Xunit;
 
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Tests/OrderRepositoryTest.cs b/test/Util.Datas.Tests.Integration/SqlServer/Tests/OrderRepositoryTest.cs
index 62bcfd52..02bab329 100644
--- a/test/Util.Datas.Tests.Integration/SqlServer/Tests/OrderRepositoryTest.cs
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Tests/OrderRepositoryTest.cs
@@ -7,7 +7,7 @@ using Util.Datas.Ef;
 using Util.Datas.Tests.Samples.Datas.SqlServer.UnitOfWorks;
 using Util.Datas.Tests.Samples.Domains.Models;
 using Util.Datas.Tests.Samples.Domains.Repositories;
-using Util.Datas.Tests.SqlServer.Confis;
+using Util.Datas.Tests.SqlServer.Configs;
 using Util.Datas.Tests.XUnitHelpers;
 using Util.Exceptions;
 using Util.Helpers;
diff --git a/test/Util.Datas.Tests.Integration/SqlServer/Tests/ProductRepositoryTest.cs b/test/Util.Datas.Tests.Integration/SqlServer/Tests/ProductRepositoryTest.cs
index 960569ad..36166fda 100644
--- a/test/Util.Datas.Tests.Integration/SqlServer/Tests/ProductRepositoryTest.cs
+++ b/test/Util.Datas.Tests.Integration/SqlServer/Tests/ProductRepositoryTest.cs
@@ -6,7 +6,7 @@ using Util.Datas.Ef;
 using Util.Datas.Tests.Samples.Datas.SqlServer.UnitOfWorks;
 using Util.Datas.Tests.Samples.Domains.Models;
 using Util.Datas.Tests.Samples.Domains.Repositories;
-using Util.Datas.Tests.SqlServer.Confis;
+using Util.Datas.Tests.SqlServer.Configs;
 using Util.Helpers;
 using Xunit;