diff --git a/src/Spring/Spring.Data/Data/Common/dbproviders.xml b/src/Spring/Spring.Data/Data/Common/dbproviders.xml index 38db1e91..36e66dc1 100644 --- a/src/Spring/Spring.Data/Data/Common/dbproviders.xml +++ b/src/Spring/Spring.Data/Data/Common/dbproviders.xml @@ -30,7 +30,7 @@ - 156,170,207,208 + 102,156,170,207,208 229 @@ -71,7 +71,7 @@ - 156,170,207,208 + 102,156,170,207,208 229 @@ -112,7 +112,7 @@ - 156,170,207,208 + 102,156,170,207,208 229 diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs index c882a6fd..cdf1fce8 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs @@ -56,7 +56,7 @@ namespace Spring.Data } - [Ignore] + [Ignore("Sanity-Check tests intended for verification of base-class behavior only")] [Test] public void SimpleCreate() { @@ -68,7 +68,7 @@ namespace Spring.Data dao.Create("John", 44); } - [Ignore] + [Ignore("Sanity-Check tests intended for verification of base-class behavior only")] [Test] public void SimpleDao() { @@ -87,7 +87,7 @@ namespace Spring.Data } - [Ignore] + [Ignore("Sanity-Check tests intended for verification of base-class behavior only")] [Test] public void SimpleDao2() { @@ -99,7 +99,7 @@ namespace Spring.Data Assert.AreEqual(1, dao.GetCountByDelegate()); } - [Ignore] + [Ignore("Sanity-Check tests intended for verification of base-class behavior only")] [Test] public void DaoOperations() { diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml index ea5eb9aa..0e5c4140 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml @@ -9,13 +9,13 @@ + value="Data Source=SPRINGQA;Initial Catalog=Credits;Integrated Security=false;User Id=springqa;Password=springqa"/> + value="Data Source=SPRINGQA;Initial Catalog=Debits;Integrated Security=false;User Id=springqa;Password=springqa"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml index 14554243..a9af1df9 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml @@ -11,16 +11,16 @@ + connectionString="Data Source=SPRINGQA;Initial Catalog=Debits;Persist Security Info=True;User ID=springqa;Password=springqa"/> + connectionString="Data Source=SPRINGQA;Initial Catalog=Credits;Persist Security Info=True;User ID=springqa;Password=springqa"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml index 5fd2c76c..e6bb7419 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml @@ -6,11 +6,11 @@ + connectionString="Data Source=SPRINGQA;Initial Catalog=Credits;Integrated Security=false;User Id=springqa;Password=springqa;Pooling=False"/> - + connectionString="Data Source=SPRINGQA;Initial Catalog=Debits;Integrated Security=false;User Id=springqa;Password=springqa;Pooling=False"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs index 1c6a8ec7..20481a3e 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs @@ -44,41 +44,63 @@ namespace Spring.Data.Generic "assembly://Spring.Data.Integration.Tests/Spring.Data.Generic/GenericAdoTemplateTests.xml"); adoTemplate = ctx["adoTemplate"] as AdoTemplate; + + RemoveTestData(); + PopulateTestData(); } + private void PopulateTestData() + { + adoTemplate.ExecuteScalar(CommandType.Text, "insert into TestObjects values (10, 'Jack')"); + adoTemplate.ExecuteScalar(CommandType.Text, "insert into TestObjects values (20, 'Jill')"); + } + + [TearDown] + public void TearDown() + { + RemoveTestData(); + } + + private void RemoveTestData() + { + adoTemplate.ExecuteNonQuery(CommandType.Text, "delete TestObjects"); + } + + [Test] public void CommandDelegateUsage() { - string postalCode = "1010"; + string name = "Jack"; int count = adoTemplate.Execute(delegate(DbCommand command) { command.CommandText = - "select count(*) from Customers where PostalCode = @PostalCode"; + "select count(*) from TestObjects where Name = @Name"; DbParameter p = command.CreateParameter(); - p.ParameterName = "@PostalCode"; - p.Value = postalCode; + p.ParameterName = "@Name"; + p.Value = name; command.Parameters.Add(p); return (int) command.ExecuteScalar(); }); - Assert.AreEqual(3, count); + Assert.AreEqual(1, count); } + [Test] public void CommandDelegateUsageDownCast() { - string postalCode = "1010"; + string name = "Jack"; int count = adoTemplate.Execute(delegate(DbCommand command) { SqlCommand sqlCommand = command as SqlCommand; command.CommandText = - "select count(*) from Customers where PostalCode = @PostalCode"; + "select count(*) from TestObjects where Name = @Name"; - sqlCommand.Parameters.AddWithValue("@PostalCode", postalCode); + sqlCommand.Parameters.AddWithValue("@Name", name); return (int) command.ExecuteScalar(); }); - Assert.AreEqual(3, count); + Assert.AreEqual(1, count); } [Test] diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml index 852a0163..fce7fffd 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml @@ -4,7 +4,7 @@ + connectionString="Data Source=SPRINGQA;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs index 1ad32bd3..40a4f4eb 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs @@ -7,5 +7,7 @@ namespace Spring.Data void SaveTwoTestObjects(TestObject to1, TestObject to2); void DeleteTwoTestObjects(string name1, string name2); + + void DeleteAllTestObjects(); } } \ No newline at end of file diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs index 55a5001f..eec9bcb1 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs @@ -27,73 +27,97 @@ using NUnit.Framework; using Spring.Context; using Spring.Context.Support; using Spring.Data.Common; +using Spring.Objects; #endregion namespace Spring.Data { - /// - /// Test a MappingAdoQuery implementation - /// - /// Mark Pollack (.NET) - [TestFixture] - public class MappingAdoQueryTests - { - #region Fields - IDbProvider dbProvider; - #endregion + /// + /// Test a MappingAdoQuery implementation + /// + /// Mark Pollack (.NET) + [TestFixture] + public class MappingAdoQueryTests + { + #region Fields + IDbProvider dbProvider; + #endregion - #region Constants + #region Constants - /// - /// The shared ILog instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (MappingAdoQueryTests)); + /// + /// The shared ILog instance for this class (and derived classes). + /// + protected static readonly ILog log = + LogManager.GetLogger(typeof(MappingAdoQueryTests)); - #endregion + private IApplicationContext ctx; - #region Constructor (s) - /// - /// Initializes a new instance of the class. - /// - public MappingAdoQueryTests() - { + #endregion - } + #region Constructor (s) + /// + /// Initializes a new instance of the class. + /// + public MappingAdoQueryTests() + { - #endregion + } - #region Properties + #endregion - #endregion + #region Properties - #region Methods + #endregion + + #region Methods [SetUp] public void CreateDbProvider() { - IApplicationContext ctx = - new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml"); + ctx = new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml"); Assert.IsNotNull(ctx); dbProvider = ctx["DbProvider"] as IDbProvider; Assert.IsNotNull(dbProvider); + + DeleteTestData(); + PopulateTestData(); + } + + private void PopulateTestData() + { + ITestObjectManager testObjectManager = ctx["testObjectManager"] as ITestObjectManager; + testObjectManager.SaveTwoTestObjects(new TestObject("Jack", 10), new TestObject("Jill", 20)); + } + + [TearDown] + public void _TestTearDown() + { + DeleteTestData(); + } + + private void DeleteTestData() + { + ITestObjectManager testObjectManager = ctx["testObjectManager"] as ITestObjectManager; + testObjectManager.DeleteAllTestObjects(); + } + + + [Test] + public void MappingAdoQuery() + { + TestObjectQuery testObjectQuery = new TestObjectQuery(dbProvider); + IDictionary inParams = new Hashtable(); + inParams.Add("@Name", "Jack"); + IList testObjectList = testObjectQuery.QueryByNamedParam(inParams); + Assert.AreEqual(1, testObjectList.Count); } - - [Test] - public void MappingAdoQuery() - { - TestObjectQuery testObjectQuery = new TestObjectQuery(dbProvider); - IDictionary inParams = new Hashtable(); - inParams.Add("UName", "George"); - IList testObjectList = testObjectQuery.QueryByNamedParam(inParams); - Assert.AreEqual(2, testObjectList.Count); - } - #endregion + #endregion - - } + + } } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs index 1eb815ca..35cfee39 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs @@ -31,10 +31,10 @@ using Spring.Context.Support; namespace Spring.Data { - [TestFixture] - public class NativeAdoTests - { - [Test] + [TestFixture] + public class NativeAdoTests + { + [Test] public void SimpleUsage() { IApplicationContext ctx = @@ -45,21 +45,18 @@ namespace Spring.Data dao.Create("John", 45); } - [Test] - public void Helloworld() - { - string connString = - @"Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"; + [Test] + public void Helloworld() + { + string connString = + @"Data Source=SPRINGQA;Initial Catalog=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"; - SqlConnection conn = new SqlConnection(connString); - conn.Open(); + SqlConnection conn = new SqlConnection(connString); conn.Open(); - //conn.BeginTransaction(IsolationLevel.Unspecified); - SqlTransaction trans = conn.BeginTransaction(); - Console.WriteLine(trans.IsolationLevel); + //conn.BeginTransaction(IsolationLevel.Unspecified); + SqlTransaction trans = conn.BeginTransaction(); - - - } - } + Assert.That(trans.IsolationLevel, Is.EqualTo(IsolationLevel.ReadCommitted)); + } + } } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs index b7bfe6a9..6ab2e40c 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs @@ -48,7 +48,7 @@ namespace Spring.Data public void TxTemplate() { IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient"); - dbProvider.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; + dbProvider.ConnectionString = @"Data Source=SPRINGQA;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; //IPlatformTransactionManager tm = new ServiceDomainPlatformTransactionManager(); //IPlatformTransactionManager tm = new TxScopeTransactionManager(); IPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider); @@ -95,7 +95,7 @@ namespace Spring.Data using (SqlConnection cn2005 = new SqlConnection()) { cn2005.ConnectionString = - @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; + @"Data Source=SPRINGQA;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; SqlCommand cmd = new SqlCommand(updateSql1, cn2005); cn2005.Open(); cmd.ExecuteNonQuery(); @@ -118,7 +118,7 @@ namespace Spring.Data System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier); using (SqlConnection cn2005 = new SqlConnection()) { - cn2005.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; + cn2005.ConnectionString = @"Data Source=SPRINGQA;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; SqlCommand cmd = new SqlCommand(updateSql2, cn2005); cn2005.Open(); cmd.ExecuteNonQuery(); @@ -153,7 +153,7 @@ namespace Spring.Data using (SqlConnection cn2005 = new SqlConnection()) { - cn2005.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; + cn2005.ConnectionString = @"Data Source=SPRINGQA;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; SqlCommand cmd = new SqlCommand(updateSql2, cn2005); cn2005.Open(); cmd.ExecuteNonQuery(); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs index 8959c387..51136d1d 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs @@ -35,7 +35,7 @@ namespace Spring.Data.Northwind public Shipper Create(string name, string phone) { - string connectionString = "Data Source=NYCSUMPOLLL;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa"; + string connectionString = "Data Source=SPRINGQA;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa;Password=springqa"; int id = 0; using (SqlConnection connection = new SqlConnection(connectionString)) { @@ -66,7 +66,7 @@ namespace Spring.Data.Northwind public Shipper CreateShorter(string name, string phone) { - string connectionString = "Data Source=NYCSUMPOLLL;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa"; + string connectionString = "Data Source=SPRINGQA;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa"; int id = 0; using (SqlConnection connection = new SqlConnection(connectionString)) { diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs index f58027e5..6a46e70b 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs @@ -24,6 +24,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Data; using System.Reflection; using NUnit.Framework; using Spring.Data.Common; @@ -41,11 +42,64 @@ namespace Spring.Data.Objects.Generic [TestFixture] public class StoredProcedureTests { + private IDbProvider _dbProvider; + [SetUp] public void Setup() { + _dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient"); + _dbProvider.ConnectionString = + @"Data Source=SPRINGQA;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"; + + IDbCommand command = _dbProvider.CreateCommand(); + command.Connection = _dbProvider.CreateConnection(); + + ClearTestData(command); + CreateTestData(command); } + [TearDown] + public void TearDown() + { + IDbCommand command = _dbProvider.CreateCommand(); + command.Connection = _dbProvider.CreateConnection(); + + ClearTestData(command); + } + + private void CreateTestData(IDbCommand command) + { + command.Connection.Open(); + + command.CommandText = "insert into TestObjects(Name,Age) values ('Jack', 10)"; + command.ExecuteNonQuery(); + + command.CommandText = "insert into TestObjects(Name,Age) values ('Jill', 20)"; + command.ExecuteNonQuery(); + + command.CommandText = "insert into Vacations(FirstName,LastName,EmployeeId,StartDate,EndDate) values ('Jack', 'Doe', 200, '1/1/2010', '1/15/2010')"; + command.ExecuteNonQuery(); + + command.CommandText = "insert into Vacations(FirstName,LastName,EmployeeId,StartDate,EndDate) values ('Jack', 'Doe', 200, '2/1/2010', '2/15/2010')"; + command.ExecuteNonQuery(); + + command.Connection.Close(); + } + + private void ClearTestData(IDbCommand command) + { + command.Connection.Open(); + + command.CommandText = "truncate table TestObjects"; + command.ExecuteNonQuery(); + + command.CommandText = "truncate table Vacations"; + command.ExecuteNonQuery(); + + command.Connection.Close(); + } + + [Test] public void TestReflection() { @@ -102,36 +156,38 @@ namespace Spring.Data.Objects.Generic MethodInfo methodInfo = rowMapperclosedType.GetMethod("MapRow", BINDING_FLAGS); //MethodInfo genMethodInfo = methodInfo.MakeGenericMethod(genericArgumentType); - object retVal = methodInfo.Invoke(rowmapper, new object[] { null, null}); + object retVal = methodInfo.Invoke(rowmapper, new object[] { null, null }); Console.WriteLine("return val = " + retVal); } [Test] - public void Test() + public void SingleTableStoredProcedure_ReturnsResult() { - IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient"); - dbProvider.ConnectionString = - @"Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"; + TestObjectStoredProc sp = new TestObjectStoredProc(_dbProvider); + IList testObjectList = sp.GetByName("Jack"); - TestObjectStoredProc sp = new TestObjectStoredProc(dbProvider); - IList testObjectList = sp.GetByName("George"); - - Assert.IsNotNull(testObjectList); - - TestObjectandVacationStoredProc vsp = new TestObjectandVacationStoredProc(dbProvider); - - System.Collections.IDictionary outParams = vsp.ExecStoreProc("George"); + Assert.That(testObjectList, Is.Not.Null); + Assert.That(testObjectList, Has.Count.EqualTo(1)); + } - testObjectList = outParams["testObjectRowMapper"] as IList; + [Test] + public void MultipleTableStoredProcedure_ReturnsResult() + { + TestObjectandVacationStoredProc vsp = new TestObjectandVacationStoredProc(_dbProvider); + + IDictionary outParams = vsp.ExecStoreProc("Jack"); + + IList testObjectList = testObjectList = outParams["testObjectRowMapper"] as IList; Assert.IsNotNull(testObjectList); Assert.AreEqual(1, testObjectList.Count); IList vacationList = outParams["vacationRowMapper"] as IList; Assert.IsNotNull(vacationList); Assert.AreEqual(2, vacationList.Count); + } } @@ -153,14 +209,14 @@ namespace Spring.Data.Objects.Generic } } - + public class TestObjectStoredProc : StoredProcedure { public TestObjectStoredProc(IDbProvider dbProvider) : base(dbProvider, "SelectByName") - { + { DeriveParameters(); - AddRowMapper("testObjectRowMapper", new TestObjectRowMapper() ); + AddRowMapper("testObjectRowMapper", new TestObjectRowMapper()); Compile(); } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs index 42593adb..92dff1cf 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs @@ -42,6 +42,7 @@ namespace Spring.Data /// /// Mark Pollack (.NET) [TestFixture] + [Ignore("ORACLE-dependent tests disabled for integration runs")] public class OracleAdoTemplateTests { #region Setup/Teardown diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs index fbaa45b8..1a9f261b 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs @@ -53,43 +53,45 @@ namespace Spring.Data public void SqlServerTest() { string errorCode = "544"; - string[] errorCodes = new string[4] {"544", "2627", "8114", "8115"}; + string[] errorCodes = new string[4] { "544", "2627", "8114", "8115" }; //Array.IndexOf() //Array.Sort(errorCodes); foreach (string code in errorCodes) { Console.WriteLine(code); } - //if (Array.BinarySearch(errorCodes, errorCode) >= 0) + //if (Array.BinarySearch(errorCodes, errorCode) >= 0) if (Array.IndexOf(errorCodes, errorCode) >= 0) - { - Console.WriteLine("yes"); - } - else - { - Assert.Fail("did not find error code"); - } + { + Console.WriteLine("yes"); + } + else + { + Assert.Fail("did not find error code"); + } IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient"); dbProvider.ConnectionString = - @"Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"; + @"Data Source=SPRINGQA;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"; AdoTemplate adoTemplate = new AdoTemplate(dbProvider); try { - adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into Vacation (id) values (1)"); - } catch (Exception e) + adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into Vacations (FirstName,LastName) values ('Jack','Doe')"); + } + catch (Exception e) { Console.Write(e); throw; } } [Test] + [Ignore("ORACLE-dependent tests disabled for integration runs")] public void OracleTest() { //Data Source=XE;User ID=hr;Unicode=True IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.OracleClient"); dbProvider.ConnectionString = "Data Source=XE;User ID=hr;Password=hr;Unicode=True"; AdoTemplate adoTemplate = new AdoTemplate(dbProvider); - decimal count = (decimal) adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from emp"); + decimal count = (decimal)adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from emp"); Assert.AreEqual(14, count); EmpProc empProc = new EmpProc(dbProvider); @@ -107,6 +109,7 @@ namespace Spring.Data } [Test] + [Ignore("ODBC-dependent tests disabled for integration runs")] public void Test() { //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse1.15"); @@ -127,52 +130,53 @@ namespace Spring.Data } Assert.IsTrue(authorList.Count > 0); } -/* - [Test] - public void StoredProc() - { - //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse1.15"); - //dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; - - - //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0"); - //dbProvider.ConnectionString = - // "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;"; - - IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); - dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; - HelloProc proc = new HelloProc(dbProvider); - IDictionary dict = proc.GetResults(); - - Assert.AreEqual("Go Sybase", dict["@inoutParam"]); - Assert.AreEqual("Hello mango", dict["@outParam"]); - Assert.AreEqual(101, (int) dict["RETURN_VALUE"]); - foreach (DictionaryEntry entry in dict) - { - Console.WriteLine("Key = " + entry.Key + ", Value = " + entry.Value); - } - } - - [Test] - public void StordProcAdoTemplate() - { - IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); - dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; - AdoTemplate adoTemplate = new AdoTemplate(dbProvider); - IDbParameters parameters = new DbParameters(dbProvider); - parameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango"; - parameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase"; - parameters.AddOut("outParam", AseDbType.VarChar, 64); - parameters.AddReturn("retValue", AseDbType.Integer); - adoTemplate.ExecuteNonQuery(CommandType.StoredProcedure, "sp_hello", parameters); - - - Assert.AreEqual("Go Sybase", parameters["@inoutParam"].Value); - Assert.AreEqual("Hello mango", parameters[2].Value); - Assert.AreEqual(101, (int) parameters[3].Value); - } -*/ + /* + [Test] + public void StoredProc() + { + //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse1.15"); + //dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; + + + //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0"); + //dbProvider.ConnectionString = + // "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;"; + + IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); + dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; + HelloProc proc = new HelloProc(dbProvider); + IDictionary dict = proc.GetResults(); + + Assert.AreEqual("Go Sybase", dict["@inoutParam"]); + Assert.AreEqual("Hello mango", dict["@outParam"]); + Assert.AreEqual(101, (int) dict["RETURN_VALUE"]); + foreach (DictionaryEntry entry in dict) + { + Console.WriteLine("Key = " + entry.Key + ", Value = " + entry.Value); + } + } + + [Test] + public void StordProcAdoTemplate() + { + IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); + dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"; + AdoTemplate adoTemplate = new AdoTemplate(dbProvider); + IDbParameters parameters = new DbParameters(dbProvider); + parameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango"; + parameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase"; + parameters.AddOut("outParam", AseDbType.VarChar, 64); + parameters.AddReturn("retValue", AseDbType.Integer); + adoTemplate.ExecuteNonQuery(CommandType.StoredProcedure, "sp_hello", parameters); + + + Assert.AreEqual("Go Sybase", parameters["@inoutParam"].Value); + Assert.AreEqual("Hello mango", parameters[2].Value); + Assert.AreEqual(101, (int) parameters[3].Value); + } + */ [Test] + [Ignore("SYBASE-ASE-dependent tests disabled for integration runs")] public void DeriveParams() { IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); @@ -190,25 +194,26 @@ namespace Spring.Data } } -/* - [Test] - public void RawDeriveParams() - { - using ( - AseConnection conn = - new AseConnection("Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';")) - { - using (AseCommand cmd = new AseCommand("@sp_hello", conn)) + /* + [Test] + public void RawDeriveParams() { - conn.Open(); - cmd.CommandType = CommandType.StoredProcedure; - AseCommandBuilder.DeriveParameters(cmd); - Console.WriteLine("Number of parameters = " + cmd.Parameters.Count); + using ( + AseConnection conn = + new AseConnection("Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';")) + { + using (AseCommand cmd = new AseCommand("@sp_hello", conn)) + { + conn.Open(); + cmd.CommandType = CommandType.StoredProcedure; + AseCommandBuilder.DeriveParameters(cmd); + Console.WriteLine("Number of parameters = " + cmd.Parameters.Count); + } + } } - } - } -*/ + */ [Test] + [Ignore("SYBASE-ASE-dependent tests disabled for integration runs")] public void QueryWithMapper() { IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15"); @@ -219,6 +224,7 @@ namespace Spring.Data } [Test] + [Ignore("ODBC-dependent tests disabled for integration runs")] public void QueryWithMapperODBC() { IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0"); @@ -230,6 +236,7 @@ namespace Spring.Data } [Test] + [Ignore("SYBASE-ASE-dependent tests disabled for integration runs")] public void QueryRawODBC() { using ( @@ -267,17 +274,17 @@ namespace Spring.Data { return AdoTemplate.QueryWithRowMapperDelegate(CommandType.StoredProcedure, "history_proc", delegate(IDataReader dataReader, int rowNum) - { - Sale sale = new Sale(); - sale.Date = dataReader.GetDateTime(0); - sale.OrderNumber = dataReader.GetString(1); - sale.Quantity = dataReader.GetInt32(2); - sale.Title = dataReader.GetString(3); - sale.Discount = dataReader.GetFloat(4); - sale.Price = dataReader.GetFloat(5); - sale.Total = dataReader.GetFloat(6); - return sale; - }, "stor_id", + { + Sale sale = new Sale(); + sale.Date = dataReader.GetDateTime(0); + sale.OrderNumber = dataReader.GetString(1); + sale.Quantity = dataReader.GetInt32(2); + sale.Title = dataReader.GetString(3); + sale.Discount = dataReader.GetFloat(4); + sale.Price = dataReader.GetFloat(5); + sale.Total = dataReader.GetFloat(6); + return sale; + }, "stor_id", DbType.String, 0, storeId); } } @@ -335,27 +342,28 @@ namespace Spring.Data set { total = value; } } } -/* - public class HelloProc : StoredProcedure - { - public HelloProc(IDbProvider provider) : base(provider, "sp_hello") + /* + public class HelloProc : StoredProcedure { - DeclaredParameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango"; - DeclaredParameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase"; - DeclaredParameters.AddOut("outParam", AseDbType.VarChar, 64); - DeclaredParameters.AddReturn("retValue", AseDbType.Integer); - Compile(); - } + public HelloProc(IDbProvider provider) : base(provider, "sp_hello") + { + DeclaredParameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango"; + DeclaredParameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase"; + DeclaredParameters.AddOut("outParam", AseDbType.VarChar, 64); + DeclaredParameters.AddReturn("retValue", AseDbType.Integer); + Compile(); + } - public IDictionary GetResults() - { - return Query("mango", "Sybase"); + public IDictionary GetResults() + { + return Query("mango", "Sybase"); + } } - } -*/ + */ public class EmpProc : StoredProcedure { - public EmpProc(IDbProvider provider) : base(provider, "TEST.Get1CurOut") + public EmpProc(IDbProvider provider) + : base(provider, "TEST.Get1CurOut") { //DeriveParameters(); DeclaredParameters.AddOut("P_CURSOR1", OracleType.Cursor); @@ -365,7 +373,7 @@ namespace Spring.Data public IDictionary GetEmployees() { - for (int i=0; i< DeclaredParameters.Count; i++) + for (int i = 0; i < DeclaredParameters.Count; i++) { Console.WriteLine("decarled parameter name = " + DeclaredParameters[i].ParameterName + ", type = " + DeclaredParameters[i].DbType); } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs index e0e19c8a..7058602e 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs @@ -33,58 +33,60 @@ using Spring.Data.Core; namespace Spring.Data.Support { - [TestFixture] - public class SimpleExceptionTranslationTests - { - #region Fields - private IDbProvider dbProvider; - private IAdoOperations adoOperations; - #endregion + [TestFixture] + public class SimpleExceptionTranslationTests + { + #region Fields + private IDbProvider dbProvider; + private IAdoOperations adoOperations; + #endregion - #region Constants + #region Constants - /// - /// The shared ILog instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (SimpleExceptionTranslationTests)); + /// + /// The shared ILog instance for this class (and derived classes). + /// + protected static readonly ILog log = + LogManager.GetLogger(typeof(SimpleExceptionTranslationTests)); - #endregion + #endregion - #region Methods + #region Methods - [SetUp] + [SetUp] public void CreateAdoTemplate() { - IApplicationContext ctx = + IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml"); Assert.IsNotNull(ctx); dbProvider = ctx["DbProvider"] as IDbProvider; Assert.IsNotNull(dbProvider); adoOperations = new AdoTemplate(dbProvider); } - + [Test] public void ExecuteNonQueryText() { - + string badSql = "insert into TestObjects(Age, Name) VALS (33, 'foo')"; try { adoOperations.ExecuteNonQuery(CommandType.Text, badSql); - } catch (BadSqlGrammarException e) + } + catch (BadSqlGrammarException e) { - + log.Error("caught correct exception", e); - } catch (Exception e) + } + catch (Exception e) { log.Error("caught incorrect exception ", e); Assert.Fail("did not throw exception of type BadSqlGrammerException"); } - - } - #endregion - } + } + #endregion + + } } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs index 12c4e741..7c7a7554 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs @@ -21,6 +21,7 @@ #region Imports using System; +using System.Collections; using Common.Logging; using Spring.Objects; using Spring.Transaction.Interceptor; @@ -82,7 +83,20 @@ namespace Spring.Data testObjectDao.Delete(name2); } - #endregion + public void DeleteAllTestObjects() + { + IList objects = testObjectDao.FindAll(); + + foreach (object testObject in objects) + { + if (testObject is ITestObject) + { + testObjectDao.Delete(((ITestObject)testObject).Name); + } + } + } + + #endregion } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs index 9d78429e..cb3b5505 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs @@ -36,7 +36,7 @@ namespace Spring.Data /// Mark Pollack (.NET) public class TestObjectQuery : MappingAdoQuery { - private static string sql = "select TestObjectNo, Age, Name from TestObjects where Name = @UName"; + private static string sql = "select TestObjectNo, Age, Name from TestObjects where Name = @Name"; public TestObjectQuery(IDbProvider dbProvider) : base(dbProvider, sql) @@ -44,7 +44,7 @@ namespace Spring.Data //DeclaredParameters = new DbParameters(dbProvider); try { - DeclaredParameters.Add("UName", SqlDbType.VarChar, 50); + DeclaredParameters.Add("Name", SqlDbType.VarChar, 50); } catch (Exception e) { Console.WriteLine(e); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml index 49bc9d6f..90f24381 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml @@ -7,7 +7,7 @@ + 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/TestTxIsolationLevelTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs index b879d6a4..b572c225 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs @@ -80,7 +80,7 @@ namespace Spring.Data using (SqlConnection cn2005 = new SqlConnection()) { cn2005.ConnectionString = - @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; + @"Data Source=SPRINGQA;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"; SqlCommand cmd = new SqlCommand(updateSql2, cn2005); cn2005.Open(); Console.WriteLine("Isolation level = " + System.Transactions.Transaction.Current.IsolationLevel); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs index 4a1686f1..0f166319 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs @@ -35,21 +35,21 @@ using Spring.Transaction.Support; namespace Spring.Data { - /// - /// Integration tests for transaction template functionality - /// - /// Mark Pollack - [TestFixture] - public class TransactionTemplateTests - { + /// + /// Integration tests for transaction template functionality + /// + /// Mark Pollack + [TestFixture] + public class TransactionTemplateTests + { private IDbProvider dbProvider; private IPlatformTransactionManager transactionManager; private IApplicationContext ctx; - - private IAdoOperations adoOperations; + + private IAdoOperations adoOperations; [SetUp] public void SetUp() @@ -57,9 +57,20 @@ namespace Spring.Data ctx = new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/templateTests.xml"); dbProvider = ctx["DbProvider"] as IDbProvider; - transactionManager = ctx["adoTransactionManager"] as IPlatformTransactionManager; + transactionManager = ctx["transactionManager"] as IPlatformTransactionManager; adoOperations = ctx["adoTemplate"] as IAdoOperations; - + + ITestObjectManager testObjectManager = ctx["testObjectManager"] as ITestObjectManager; + testObjectManager.DeleteAllTestObjects(); + testObjectManager.SaveTwoTestObjects(new TestObject("Jack", 10), new TestObject("Jill", 20)); + } + + [TearDown] + public void TearDown() + { + ITestObjectManager testObjectManager = ctx["testObjectManager"] as ITestObjectManager; + testObjectManager.DeleteTwoTestObjects("Jack", "Jill"); + testObjectManager.DeleteAllTestObjects(); } @@ -73,7 +84,7 @@ namespace Spring.Data [Test] public void DeclarativeViaAutoProxyCreator() { - ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; + ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"]; PerformOperations(mgr, dao); } @@ -88,7 +99,7 @@ namespace Spring.Data [Test] public void DeclarativeViaTransactionProxyFactoryObject() { - ITestObjectManager mgr = ctx["testObjectManagerTP"] as ITestObjectManager; + ITestObjectManager mgr = ctx["testObjectManagerTP"] as ITestObjectManager; ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDao"]; PerformOperations(mgr, dao); } @@ -102,7 +113,7 @@ namespace Spring.Data public void DeclarativeViaProxyFactoryObject() { ITestObjectManager mgr = ctx["testObjectManagerPF"] as ITestObjectManager; - TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"]; + TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"]; PerformOperations(mgr, dao); } @@ -121,35 +132,35 @@ namespace Spring.Data coordinator.TestObjectManager.DeleteTwoTestObjects("Jack", "Jill"); } - public static void PerformOperations(ITestObjectManager mgr, + public static void PerformOperations(ITestObjectManager mgr, ITestObjectDao dao) - { - Assert.IsNotNull(mgr); - TestObject to1 = new TestObject(); - to1.Name = "Jack"; - to1.Age = 7; - TestObject to2 = new TestObject(); - to2.Name = "Jill"; - to2.Age = 8; - mgr.SaveTwoTestObjects(to1, to2); - - TestObject to = dao.FindByName("Jack"); - Assert.IsNotNull(to); - - to = dao.FindByName("Jill"); - Assert.IsNotNull(to); - Assert.AreEqual("Jill", to.Name); - - mgr.DeleteTwoTestObjects("Jack", "Jill"); - - to = dao.FindByName("Jack"); - Assert.IsNull(to); - - to = dao.FindByName("Jill"); - Assert.IsNull(to); - } + { + Assert.IsNotNull(mgr); + TestObject to1 = new TestObject(); + to1.Name = "Jack"; + to1.Age = 7; + TestObject to2 = new TestObject(); + to2.Name = "Jill"; + to2.Age = 8; + mgr.SaveTwoTestObjects(to1, to2); - [Test] + TestObject to = dao.FindByName("Jack"); + Assert.IsNotNull(to); + + to = dao.FindByName("Jill"); + Assert.IsNotNull(to); + Assert.AreEqual("Jill", to.Name); + + mgr.DeleteTwoTestObjects("Jack", "Jill"); + + to = dao.FindByName("Jack"); + Assert.IsNull(to); + + to = dao.FindByName("Jill"); + Assert.IsNull(to); + } + + [Test] public void ExecuteTemplate() { TransactionTemplate tt = new TransactionTemplate(transactionManager); @@ -164,7 +175,7 @@ namespace Spring.Data def.PropagationBehavior = TransactionPropagation.Required; ITransactionStatus status = transactionManager.GetTransaction(def); - + int iCount = 0; try { @@ -176,7 +187,8 @@ namespace Spring.Data */ //other AdoCommands can be executed within same tx. - } catch (Exception e) + } + catch (Exception e) { transactionManager.Rollback(status); throw e; @@ -186,12 +198,12 @@ namespace Spring.Data } - + private class SimpleTransactionCallback : ITransactionCallback { private IDbProvider dbProvider; - public SimpleTransactionCallback(IDbProvider dbp) + public SimpleTransactionCallback(IDbProvider dbp) { dbProvider = dbp; } @@ -207,10 +219,10 @@ namespace Spring.Data return adoTemplate.Execute(new TestCommandCallback()); } } - + private class TestCommandCallback : ICommandCallback { - + public Object DoInCommand(IDbCommand cmd) { cmd.CommandText = "SELECT COUNT(*) FROM TestObjects"; @@ -223,5 +235,5 @@ namespace Spring.Data } } - } + } } diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml index 24bfe7ad..29d0c9e6 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml @@ -3,17 +3,25 @@ xmlns:db="http://www.springframework.net/database"> - - - - - + + + + + + + + + \ No newline at end of file diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml b/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml index aba45ad8..c875f727 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml @@ -7,12 +7,12 @@ + connectionString="Data Source=SPRINGQA;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml b/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml index 2e4f16ba..5239d276 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml @@ -4,7 +4,7 @@ + connectionString="Data Source=SPRINGQA;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml index 1a68fb54..493416cc 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj index a209d791..c03ed953 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj +++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj @@ -177,7 +177,9 @@ - + + Designer +