Update config files for test projects

peetw · peetw · commit e531577eaea6 · 2019-06-04T16:45:30.000+01:00
diff --git a/Tests.NHibernate.Spatial.MsSql2008/TestConfiguration.cs b/Tests.NHibernate.Spatial.MsSql2008/TestConfiguration.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Configuration;
 using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
@@ -8,6 +9,15 @@ namespace Tests.NHibernate.Spatial
 {
     internal static class TestConfiguration
     {
+        private static readonly IConfigurationRoot _configurationRoot;
+
+        static TestConfiguration()
+        {
+            _configurationRoot = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .Build();
+        }
+
         public static void Configure(Configuration configuration)
         {
             IDictionary<string, string> properties = new Dictionary<string, string>
@@ -16,7 +26,7 @@ public static void Configure(Configuration configuration)
                 [Environment.Dialect] = typeof(MsSql2008GeometryDialect).AssemblyQualifiedName,
                 [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
                 [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
-                [Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2008"].ConnectionString
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MsSql2008")
             };
             configuration.SetProperties(properties);
         }
diff --git a/Tests.NHibernate.Spatial.MsSql2008/Tests.NHibernate.Spatial.MsSql2008.csproj b/Tests.NHibernate.Spatial.MsSql2008/Tests.NHibernate.Spatial.MsSql2008.csproj
@@ -19,4 +19,10 @@
     <ProjectReference Include="..\Tests.NHibernate.Spatial\Tests.NHibernate.Spatial.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tests.NHibernate.Spatial.MsSql2008/app.config b/Tests.NHibernate.Spatial.MsSql2008/app.config
diff --git a/Tests.NHibernate.Spatial.MsSql2008/appsettings.json b/Tests.NHibernate.Spatial.MsSql2008/appsettings.json
@@ -0,0 +1,6 @@
+{
+  "ConnectionStrings": {
+    "_comment": " NOTE: Must specify SQL Server 2012 rather than SQL Server 2008 for the Type System Version attribute (see issue #72)",
+    "MsSql2008": "Server=(local)\\SQL2008R2SP2;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012"
+  }
+}
diff --git a/Tests.NHibernate.Spatial.MsSql2012/TestConfiguration.cs b/Tests.NHibernate.Spatial.MsSql2012/TestConfiguration.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Configuration;
 using NHibernate.Bytecode;
 using NHibernate.Cfg;
 using NHibernate.Driver;
@@ -8,6 +9,15 @@ namespace Tests.NHibernate.Spatial
 {
     internal static class TestConfiguration
     {
+        private static readonly IConfigurationRoot _configurationRoot;
+
+        static TestConfiguration()
+        {
+            _configurationRoot = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .Build();
+        }
+
         public static void Configure(Configuration configuration)
         {
             IDictionary<string, string> properties = new Dictionary<string, string>
@@ -16,7 +26,7 @@ public static void Configure(Configuration configuration)
                 [Environment.Dialect] = typeof(MsSql2012GeometryDialect).AssemblyQualifiedName,
                 [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
                 [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
-                [Environment.ConnectionString] = System.Configuration.ConfigurationManager.ConnectionStrings["SqlServer2012"].ConnectionString
+                [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MsSql2012")
             };
             configuration.SetProperties(properties);
         }
diff --git a/Tests.NHibernate.Spatial.MsSql2012/Tests.NHibernate.Spatial.MsSql2012.csproj b/Tests.NHibernate.Spatial.MsSql2012/Tests.NHibernate.Spatial.MsSql2012.csproj
@@ -18,4 +18,10 @@
     <ProjectReference Include="..\Tests.NHibernate.Spatial.MsSql2008\Tests.NHibernate.Spatial.MsSql2008.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tests.NHibernate.Spatial.MsSql2012/app.config b/Tests.NHibernate.Spatial.MsSql2012/app.config
diff --git a/Tests.NHibernate.Spatial.MsSql2012/appsettings.json b/Tests.NHibernate.Spatial.MsSql2012/appsettings.json
@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "MsSql2012": "Server=(local)\\SQL2012SP1;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012"
+  }
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "ConnectionStrings": {
 +    "MsSql2012": "Server=(local)\\SQL2012SP1;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012"
 +  }
 +}