Spring.Data: fix test to work in NET5 (#207)

rpaterlini · Roberto Paterlini · web-flow · commit 9d7325bd6751 · 2021-07-30T19:44:59.000+03:00
Co-authored-by: Roberto Paterlini &lt;r.paterlini@almaviva.it&gt;
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj
@@ -74,5 +74,6 @@
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
     <Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)testhost.dll.config&quot;" />
+    <Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)ReSharperTestRunner64.dll.config&quot;" />
   </Target>
 </Project>
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs
@@ -141,6 +141,12 @@ protected override string[] ConfigLocations
             }
 	    }
 
-	    #endregion
+        protected override void OnSetUp()
+        {
+            TestObjectDao.Cleanup();
+            base.OnSetUp();
+        }
+
+        #endregion
 	}
 }
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs
@@ -50,6 +50,9 @@ public void SetUp()
         }
 
         [Test]
+#if NETCOREAPP
+        [Ignore("Not supported on .NET Core")]
+#endif
         public void DeclarativeWithAttributes()
         {
             IAccountManager mgr = ctx["accountManager"] as IAccountManager;
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs
@@ -44,6 +44,9 @@ public void SetUp()
         }
 
         [Test]
+#if NETCOREAPP
+        [Ignore("Not supported on .NET Core")]
+#endif
         public void DeclarativeWithAttributes()
         {
             SimpleAccountManager mgr = ctx["accountManager"] as SimpleAccountManager;
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectDao.cs
@@ -19,5 +19,6 @@ public interface ITestObjectDao
         //
         int GetCountByAltMethod(int lowerAgeLimit);
         int GetCountByCommandSetter(int lowerAgeLimit);
+        void Cleanup();
     }
 }
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs
@@ -201,5 +201,10 @@ public int GetCountByCommandSetter(int lowerAgeLimit)
         {
             throw new NotImplementedException();
         }
+
+        public void Cleanup()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs
@@ -145,5 +145,10 @@ public object MapRow(IDataReader dataReader, int rowNum)
             #endregion
 
         }
-	}
+
+        public void Cleanup()
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text, "delete from TestObjects ");
+        }
+    }
 }
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml
@@ -4,9 +4,16 @@
          xmlns:tx="http://www.springframework.net/tx"
          xmlns:aop="http://www.springframework.net/aop">
 
+  <object type="Spring.Objects.Factory.Config.VariablePlaceholderConfigurer, Spring.Core">
+    <property name="VariableSources">
+      <list>
+        <object type="Spring.ProviderNameSource, Spring.Data.Integration.Tests" />
+      </list>
+    </property>
+  </object>
 
   <db:provider  id="DbProvider"
-              provider="SqlServer-2.0"
+              provider="${providerName}"
               connectionString="Data Source=SPRINGQA;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/>
 
 
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml
@@ -3,9 +3,16 @@
          xmlns:db="http://www.springframework.net/database">
 
 
+  <object type="Spring.Objects.Factory.Config.VariablePlaceholderConfigurer, Spring.Core">
+    <property name="VariableSources">
+      <list>
+        <object type="Spring.ProviderNameSource, Spring.Data.Integration.Tests" />
+      </list>
+    </property>
+  </object>
 
   <db:provider id="DbProvider"
-               provider="SqlServer-2.0"
+               provider="${providerName}"
                connectionString="Data Source=SPRINGQA;Database=Spring;Trusted_Connection=False;User ID=springqa;Password=springqa"/>
 
   <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml b/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml
@@ -2,8 +2,16 @@
 <objects xmlns='http://www.springframework.net'
          xmlns:db="http://www.springframework.net/database">
 
+  <object type="Spring.Objects.Factory.Config.VariablePlaceholderConfigurer, Spring.Core">
+    <property name="VariableSources">
+      <list>
+        <object type="Spring.ProviderNameSource, Spring.Data.Integration.Tests" />
+      </list>
+    </property>
+  </object>
+
   <db:provider id="DbProvider"
-               provider="SqlServer-2.0"
+               provider="${providerName}"
                connectionString="Data Source=SPRINGQA;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
 
     <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
diff --git a/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs b/test/Spring/Spring.Data.Integration.Tests/ProviderNameSource.cs
@@ -0,0 +1,49 @@
+﻿#region License
+
+// /*
+//  * Copyright 2018 the original author or authors.
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  *      http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
+
+#endregion
+
+#region using
+
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring
+{
+    public class ProviderNameSource : IVariableSource
+    {
+        public bool CanResolveVariable(string name)
+        {
+            return name.ToLower() == "providername";
+        }
+
+        public string ResolveVariable(string name)
+        {
+            if (name.ToLower() != "providername")
+            {
+                return null;
+            }
+#if NETCOREAPP
+            return "SqlServer";
+#else
+            return "SqlServer-2.0";
+#endif
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,12 @@ protected override string[] ConfigLocations`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`- #endregion`
	`144`	`+ protected override void OnSetUp()`
	`145`	`+ {`
	`146`	`+ TestObjectDao.Cleanup();`
	`147`	`+ base.OnSetUp();`
	`148`	`+ }`
	`149`	`+`
	`150`	`+ #endregion`
`145`	`151`	`}`
`146`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ public void SetUp()`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`[Test]`
	`53`	`+#if NETCOREAPP`
	`54`	`+ [Ignore("Not supported on .NET Core")]`
	`55`	`+#endif`
`53`	`56`	`public void DeclarativeWithAttributes()`
`54`	`57`	`{`
`55`	`58`	`IAccountManager mgr = ctx["accountManager"] as IAccountManager;`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public void SetUp()`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`[Test]`
	`47`	`+#if NETCOREAPP`
	`48`	`+ [Ignore("Not supported on .NET Core")]`
	`49`	`+#endif`
`47`	`50`	`public void DeclarativeWithAttributes()`
`48`	`51`	`{`
`49`	`52`	`SimpleAccountManager mgr = ctx["accountManager"] as SimpleAccountManager;`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ public interface ITestObjectDao`
`19`	`19`	`//`
`20`	`20`	`int GetCountByAltMethod(int lowerAgeLimit);`
`21`	`21`	`int GetCountByCommandSetter(int lowerAgeLimit);`
	`22`	`+ void Cleanup();`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,5 +201,10 @@ public int GetCountByCommandSetter(int lowerAgeLimit)`
`201`	`201`	`{`
`202`	`202`	`throw new NotImplementedException();`
`203`	`203`	`}`
	`204`	`+`
	`205`	`+ public void Cleanup()`
	`206`	`+ {`
	`207`	`+ throw new NotImplementedException();`
	`208`	`+ }`
`204`	`209`	`}`
`205`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,5 +145,10 @@ public object MapRow(IDataReader dataReader, int rowNum)`
`145`	`145`	`#endregion`
`146`	`146`
`147`	`147`	`}`
`148`		`- }`
	`148`	`+`
	`149`	`+ public void Cleanup()`
	`150`	`+ {`
	`151`	`+ AdoTemplate.ExecuteNonQuery(CommandType.Text, "delete from TestObjects ");`
	`152`	`+ }`
	`153`	`+ }`
`149`	`154`	`}`