|
From: Mark P. <mar...@us...> - 2008-01-29 18:22:40
|
Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8407 Modified Files: AccountManager.cs AdoTemplateTests.cs CreateTestObjectNonQuery.cs NativeAdoTestObjectDao.cs NativeAdoTests.cs StoredProcedureTests.cs TestObjectStoredProcedure.cs adoTemplateTests.xml autoDeclarativeServices.xml nativeAdoTests.xml templateTests.xml Log Message: sync up misc integration testing work. Index: TestObjectStoredProcedure.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestObjectStoredProcedure.cs 25 Jul 2007 08:25:26 -0000 1.2 --- TestObjectStoredProcedure.cs 29 Jan 2008 18:22:33 -0000 1.3 *************** *** 50,54 **** --- 50,62 ---- //the 100 is for the out parameter that is incorrectly classified as input-output return Query(name); + + } + + public IDictionary GetResultsUsingInDictionary(IDictionary inParams) + { + return ExecuteNonQueryByNamedParam(inParams); } + + } Index: AccountManager.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/AccountManager.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AccountManager.cs 7 Dec 2006 05:00:36 -0000 1.2 --- AccountManager.cs 29 Jan 2008 18:22:33 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- using System; + using System.Data; using Spring.Transaction.Interceptor; *************** *** 26,34 **** } ! [Transaction()] public void DoTransfer(float creditAmount, float debitAmount) { creditDao.CreateCredit(creditAmount); debitDao.DebitAccount(debitAmount); } --- 27,36 ---- } ! [Transaction] public void DoTransfer(float creditAmount, float debitAmount) { creditDao.CreateCredit(creditAmount); debitDao.DebitAccount(debitAmount); + } Index: templateTests.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** templateTests.xml 17 Sep 2007 19:18:50 -0000 1.4 --- templateTests.xml 29 Jan 2008 18:22:33 -0000 1.5 *************** *** 4,10 **** <d:provider id="DbProvider" ! provider="SqlServer-1.1" ! connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> <object id="Parent" --- 4,26 ---- <d:provider id="DbProvider" ! provider="System.Data.SqlClient" ! connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/> ! ! <object name="LoggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop"> ! <property name="logUniqueIdentifier" value="true"/> ! <property name="logExecutionTime" value="true"/> ! <property name="logMethodArguments" value="true"/> ! ! <property name="Separator" value=";"/> ! <property name="LogLevel" value="Info"/> ! ! <property name="HideProxyTypeNames" value="true"/> ! <property name="UseDynamicLogger" value="true"/> ! </object> + <object id="SetterAndMethodLoggingAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop"> + <property name="advice" ref="LoggingAdvice" /> + <property name="pattern" value=".*" /> + </object> <object id="Parent" *************** *** 37,42 **** <object name="autoProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"> ! <property name="InterceptorNames" value="transactionInterceptor"/> <property name="ObjectNames"> <list> --- 53,66 ---- <object name="autoProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"> ! ! <property name="InterceptorNames"> ! <list> ! <value>SetterAndMethodLoggingAdvisor</value> ! <value>transactionInterceptor</value> ! </list> ! </property> ! <!-- <property name="InterceptorNames" value="transactionInterceptor"/> + --> <property name="ObjectNames"> <list> Index: AdoTemplateTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AdoTemplateTests.cs 3 Aug 2007 19:51:22 -0000 1.10 --- AdoTemplateTests.cs 29 Jan 2008 18:22:33 -0000 1.11 *************** *** 84,88 **** dbProvider = ctx["DbProvider"] as IDbProvider; Assert.IsNotNull(dbProvider); ! adoOperations = new AdoTemplate(dbProvider); } --- 84,94 ---- dbProvider = ctx["DbProvider"] as IDbProvider; Assert.IsNotNull(dbProvider); ! UserCredentialsDbProvider userCredentialsDbProvider = dbProvider as UserCredentialsDbProvider; ! Assert.IsNotNull(userCredentialsDbProvider); ! ! //userCredentialsDbProvider.Username = "User ID=springqa"; ! //userCredentialsDbProvider.Password = "Password=springqa"; ! userCredentialsDbProvider.SetCredentialsForCurrentThread("User ID=springqa", "Password=springqa"); ! adoOperations = new AdoTemplate(userCredentialsDbProvider); } Index: adoTemplateTests.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** adoTemplateTests.xml 30 Aug 2007 20:00:07 -0000 1.6 --- adoTemplateTests.xml 29 Jan 2008 18:22:33 -0000 1.7 *************** *** 3,11 **** xmlns:d="http://www.springframework.net/database"> <d:provider id="DbProvider" provider="SqlServer-2.0" ! connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> ! ! <!-- <object id="DbProvider" type="Spring.Data.Common.DbProviderFactoryObject, Spring.Data"> <property name="ProviderName" value="SqlServer-1.1"/> --- 3,20 ---- xmlns:d="http://www.springframework.net/database"> + <!-- ;User ID=springqa;Password=springqa; --> + + <d:provider id="DbProvider" provider="SqlServer-2.0" ! connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/> ! <!-- Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa --> ! <!-- ! ! <d:provider id="DbProvider" ! provider="SqlServer-1.1" ! connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> ! --> ! <!-- <object id="DbProvider" type="Spring.Data.Common.DbProviderFactoryObject, Spring.Data"> <property name="ProviderName" value="SqlServer-1.1"/> *************** *** 15,18 **** --- 24,28 ---- </object> --> + <object id="adoTemplate" Index: nativeAdoTests.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nativeAdoTests.xml 18 May 2006 21:37:53 -0000 1.1 --- nativeAdoTests.xml 29 Jan 2008 18:22:33 -0000 1.2 *************** *** 5,9 **** <object id="testObjectDao" type="Spring.Data.NativeAdoTestObjectDao, Spring.Data.Integration.Tests"> ! <property name="ConnectionString" value="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> </object> --- 5,9 ---- <object id="testObjectDao" type="Spring.Data.NativeAdoTestObjectDao, Spring.Data.Integration.Tests"> ! <property name="ConnectionString" value="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> </object> Index: autoDeclarativeServices.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** autoDeclarativeServices.xml 17 Sep 2007 19:18:50 -0000 1.6 --- autoDeclarativeServices.xml 29 Jan 2008 18:22:33 -0000 1.7 *************** *** 3,16 **** xmlns:d="http://www.springframework.net/database"> ! <d:provider id="DbProvider" provider="SqlServer-2.0" connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/> ! ! <!-- <d:provider id="DbProvider" provider="SqlServer-1.1" ! connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> ! --> <object id="adoTransactionManager" type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data"> --- 3,15 ---- xmlns:d="http://www.springframework.net/database"> ! <!-- <d:provider id="DbProvider" provider="SqlServer-2.0" connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/> ! --> ! <d:provider id="DbProvider" provider="SqlServer-1.1" ! connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> <object id="adoTransactionManager" type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data"> Index: NativeAdoTestObjectDao.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NativeAdoTestObjectDao.cs 16 Aug 2006 08:15:23 -0000 1.4 --- NativeAdoTestObjectDao.cs 29 Jan 2008 18:22:33 -0000 1.5 *************** *** 1,6 **** - #region Imports using System; using System.Data.SqlClient; using System.Text; --- 1,7 ---- #region Imports using System; + using System.Collections; + using System.Data; using System.Data.SqlClient; using System.Text; *************** *** 11,45 **** namespace Spring.Data { ! public class NativeAdoTestObjectDao : ITestObjectDao { private String connectionString; - - public string ConnectionString - { - get { return connectionString; } - set { connectionString = value; } - } ! public void Create2(string name, int age) ! { using (SqlConnection connection = new SqlConnection(connectionString)) { ! String sql = String.Format("insert into TestObjects(Age, Name) " + ! "VALUES ({0}, '{1}')", age, name); ! using (SqlCommand cmd = new SqlCommand(sql, connection)) { connection.Open(); ! cmd.ExecuteNonQuery(); } } ! ! } ! public void Create(string name, int age) { using (SqlConnection connection = new SqlConnection(connectionString)) { /* string strSql = "insert into TestObjects(Age,Name) values (@Age,@Name)"; --- 12,119 ---- namespace Spring.Data { ! public class NativeAdoTestObjectDao : ITestObjectDao { private String connectionString; ! public string ConnectionString ! { ! get { return connectionString; } ! set { connectionString = value; } ! } ! ! ! public IList ExplicitTx() ! { ! try ! { ! using (SqlConnection connection = new SqlConnection(connectionString)) ! { ! connection.Open(); ! ! using (SqlTransaction transaction = connection.BeginTransaction()) ! { ! using (SqlCommand command = new SqlCommand("sql")) ! { ! command.Connection = connection; ! command.Transaction = transaction; ! ! /* ! * dbParameters.Add("savings", DbType.Decimal).Value = b.Savings.AsDecimal(); ! dbParameters.Add("accountId", DbType.Int).Value = account.EntityId; ! dbParameters.Add("name", DbType.String).Value = b.Name; ! */ ! command.Parameters.Add("@savings", SqlDbType.Decimal).Value = 1;// = b.Savings.AsDecimal(); ! command.Parameters.Add("@accountId", SqlDbType.Int).Value = 2; ! command.Parameters.Add("@name", SqlDbType.NVarChar, 40).Value = 3; ! command.ExecuteNonQuery(); ! //foreach (Benificiary b in Account.Beneficiaries) ! //{ ! ! //} ! ! transaction.Commit(); ! } ! } ! } ! } catch (Exception) ! { ! //log exception and rethrow ! } ! return null; ! } ! ! public IList FindAllPeople() ! { ! IList results = new ArrayList(); ! try ! { ! using (SqlConnection connection = new SqlConnection(connectionString)) ! { ! string sql = "select Name, Age from ..."; ! ! using (SqlCommand command = new SqlCommand(sql, connection)) ! { ! connection.Open(); ! using (SqlDataReader reader = command.ExecuteReader()) ! { ! while (reader.Read()) ! { ! //process the result set - populate Person object, add to array ! } ! } ! } ! } ! } ! catch (Exception) ! { ! //throw application exception ! } ! return results; ! } ! ! public void Create2(string name, int age) ! { using (SqlConnection connection = new SqlConnection(connectionString)) { ! String sql = String.Format("insert into TestObjects(Age, Name) " + ! "VALUES ({0}, '{1}')", age, name); ! using (SqlCommand cmd = new SqlCommand(sql, connection)) { connection.Open(); ! cmd.ExecuteNonQuery(); } } ! } ! ! public void Create(string name, int age) { using (SqlConnection connection = new SqlConnection(connectionString)) { + SqlParameter p1 = new SqlParameter("name", SqlDbType.NVarChar); + p1.Value = "asdf"; + /* string strSql = "insert into TestObjects(Age,Name) values (@Age,@Name)"; *************** *** 60,75 **** */ ! ! StringBuilder sb = new StringBuilder(); sb.AppendFormat( ! "insert into TestObjects(Age, Name) VALUES ({0}, '{1}')", age, name); ! SqlCommand comm = connection.CreateCommand(); comm.CommandText = sb.ToString(); ! ! connection.Open(); ! comm.ExecuteNonQuery(); } } --- 134,149 ---- */ ! ! StringBuilder sb = new StringBuilder(); sb.AppendFormat( ! "insert into TestObjects(Age, Name) VALUES ({0}, '{1}')", age, name); ! SqlCommand comm = connection.CreateCommand(); comm.CommandText = sb.ToString(); ! ! connection.Open(); ! comm.ExecuteNonQuery(); } } *************** *** 109,131 **** } ! public int GetCount(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } ! public int GetCount(int lowerAgeLimit, string name) ! { ! throw new NotImplementedException(); ! } ! public int GetCountByAltMethod(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } ! public int GetCountByCommandSetter(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } } ! } --- 183,205 ---- } ! public int GetCount(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } ! public int GetCount(int lowerAgeLimit, string name) ! { ! throw new NotImplementedException(); ! } ! public int GetCountByAltMethod(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } ! public int GetCountByCommandSetter(int lowerAgeLimit) ! { ! throw new NotImplementedException(); ! } } ! } \ No newline at end of file Index: CreateTestObjectNonQuery.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreateTestObjectNonQuery.cs 21 Jun 2006 14:07:30 -0000 1.1 --- CreateTestObjectNonQuery.cs 29 Jan 2008 18:22:33 -0000 1.2 *************** *** 32,36 **** { /// <summary> ! /// Simple stored procedure with only 'in' args to create a testobject record /// </summary> /// <author>Mark Pollack (.NET)</author> --- 32,36 ---- { /// <summary> ! /// Simple insert non query object with 'in' args to create a testobject. /// </summary> /// <author>Mark Pollack (.NET)</author> Index: StoredProcedureTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StoredProcedureTests.cs 11 Oct 2007 06:03:26 -0000 1.4 --- StoredProcedureTests.cs 29 Jan 2008 18:22:33 -0000 1.5 *************** *** 87,90 **** --- 87,101 ---- ", " + entry.Value); } + + IDictionary inParams = new Hashtable(); + inParams.Add("@Name", "George"); + results = sproc.GetResultsUsingInDictionary(inParams); + Console.WriteLine("\n\n\n"); + foreach (DictionaryEntry entry in results) + { + Console.WriteLine(entry.Key + + ", " + entry.Value); + } + } Index: NativeAdoTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NativeAdoTests.cs 5 Jun 2006 07:26:37 -0000 1.2 --- NativeAdoTests.cs 29 Jan 2008 18:22:33 -0000 1.3 *************** *** 22,25 **** --- 22,27 ---- using System; + using System.Data; + using System.Data.SqlClient; using NUnit.Framework; using Spring.Context; *************** *** 43,46 **** --- 45,64 ---- 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"; + + SqlConnection conn = new SqlConnection(connString); + conn.Open(); + //conn.BeginTransaction(IsolationLevel.Unspecified); + SqlTransaction trans = conn.BeginTransaction(); + Console.WriteLine(trans.IsolationLevel); + + + + } } } |
