You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by gb...@apache.org on 2006/06/28 20:49:06 UTC
svn commit: r417844 - in /ibatis/trunk/cs/mapper: IBatisNet.DataAccess.Test/
IBatisNet.DataAccess.Test/Dao/Implementations/
IBatisNet.DataAccess.Test/NUnit/DaoTests/
IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/
IBatisNet.DataAccess.Test/NUnit/Da...
Author: gbayon
Date: Wed Jun 28 11:49:05 2006
New Revision: 417844
URL: http://svn.apache.org/viewvc?rev=417844&view=rev
Log:
- Generalized IDaoManager usage
- Minor change in test for .NET 2.0
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Dao/Implementations/BaseDao.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.2005.csproj
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/AdoDaoTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MySql/AdoDaoTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/SqlMapDaoTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IDaoManager.cs
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Dao/Implementations/BaseDao.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Dao/Implementations/BaseDao.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Dao/Implementations/BaseDao.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Dao/Implementations/BaseDao.cs Wed Jun 28 11:49:05 2006
@@ -17,7 +17,7 @@
/// <returns>A DaoSession</returns>
protected DaoSession GetContext()
{
- DaoManager daoManager = DaoManager.GetInstance(this);
+ IDaoManager daoManager = DaoManager.GetInstance(this);
return (daoManager.LocalDaoSession as DaoSession);
}
}
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.2005.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.2005.csproj?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.2005.csproj (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.2005.csproj Wed Jun 28 11:49:05 2006
@@ -78,6 +78,7 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Include="System.configuration" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/AdoDaoTest.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/AdoDaoTest.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/AdoDaoTest.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MSSQL/AdoDaoTest.cs Wed Jun 28 11:49:05 2006
@@ -17,11 +17,17 @@
public void FixtureSetUp()
{
DomDaoManagerBuilder builder = new DomDaoManagerBuilder();
+#if dotnet2
+ builder.Configure( "dao_MSSQL_"
+ + ConfigurationManager.AppSettings["providerType"] + ".config");
+ daoManager = DaoManager.GetInstance();
+#else
builder.Configure( "dao_MSSQL_"
+ ConfigurationSettings.AppSettings["providerType"] + ".config" );
daoManager = DaoManager.GetInstance();
+#endif
- }
+ }
/// <summary>
/// Initialisation
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MySql/AdoDaoTest.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MySql/AdoDaoTest.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MySql/AdoDaoTest.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/ADO/MySql/AdoDaoTest.cs Wed Jun 28 11:49:05 2006
@@ -17,9 +17,14 @@
public void FixtureSetUp()
{
DomDaoManagerBuilder builder = new DomDaoManagerBuilder();
+#if dotnet2
builder.Configure( "dao_MySql_"
- + ConfigurationSettings.AppSettings["providerType"] + ".config" );
- daoManager = DaoManager.GetInstance();
+ + ConfigurationManager.AppSettings["providerType"] + ".config");
+#else
+ builder.Configure( "dao_MySql_"
+ + ConfigurationSettings.AppSettings["providerType"] + ".config" );
+#endif
+ daoManager = DaoManager.GetInstance();
}
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs Wed Jun 28 11:49:05 2006
@@ -34,8 +34,13 @@
/// </summary>
static BaseDaoTest()
{
+ #if dotnet2
+ ScriptDirectory = Path.Combine(Path.Combine(Path.Combine(Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationManager.AppSettings["database"]) + Path.DirectorySeparatorChar;
+
+ #else
ScriptDirectory = Path.Combine(Path.Combine(Path.Combine(Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationSettings.AppSettings["database"]) + Path.DirectorySeparatorChar;
- }
+ #endif
+ }
/// <summary>
@@ -43,7 +48,7 @@
/// </summary>
/// <param name="datasource">The datasource.</param>
/// <param name="script">The sql batch</param>
- protected static void InitScript(DataSource datasource, string script)
+ protected static void InitScript(IDataSource datasource, string script)
{
ScriptRunner runner = new ScriptRunner();
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/SqlMapDaoTest.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/SqlMapDaoTest.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/SqlMapDaoTest.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/SqlMapDaoTest.cs Wed Jun 28 11:49:05 2006
@@ -16,8 +16,13 @@
public void FixtureSetUp()
{
DomDaoManagerBuilder builder = new DomDaoManagerBuilder();
+#if dotnet2
+ builder.Configure("dao" + "_" + ConfigurationManager.AppSettings["database"] + "_"
+ + ConfigurationManager.AppSettings["providerType"] + ".config");
+#else
builder.Configure( "dao"+ "_" + ConfigurationSettings.AppSettings["database"] + "_"
+ ConfigurationSettings.AppSettings["providerType"] + ".config" );
+#endif
daoManager = DaoManager.GetInstance("SqlMapDao");
}
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt Wed Jun 28 11:49:05 2006
@@ -3,7 +3,7 @@
------------------------------
1.8 - DD/MM/AAAA
------------------------------
-- Added IDaoManager interface to simplify mock or stub
+- Added IDaoManager interface to simplify mock or stub, methods returning DaoManager instance now return IDaoManager DaoManager.
------------------------------
1.7 - 15/12/2005
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs Wed Jun 28 11:49:05 2006
@@ -53,7 +53,7 @@
/// <example>
/// <pre/>
/// <b>Exemple 1:</b>
- /// DaoManager daoManager = DaoManager.GetInstance("PetStore");
+ /// IDaoManager daoManager = DaoManager.GetInstance("PetStore");
/// ICategoryDao categoryDao = (ICategoryDao) daoManager.GetDao("Category");
/// DaoSession daoSession = daoManager.GetDaoSession();
/// daoSession.OpenConnection();
@@ -61,7 +61,7 @@
/// daoSession.CloseConnection(daoSession);
/// <p/>
/// <b>Exemple 2:</b>
- /// DaoManager daoManager = DaoManager.GetInstance("PetStore");
+ /// IDaoManager daoManager = DaoManager.GetInstance("PetStore");
/// ICategoryDao categoryDao = (ICategoryDao) daoManager.GetDao("Category");
/// daoManager.OpenConnection();
/// ArrayList categoryList = categoryGetCategoryList(5);
@@ -74,7 +74,7 @@
/// c1.Add(p1);
/// c2.Add(p2);
/// <p/>
- /// DaoManager daoManager = DaoManager.GetInstance("PetStore");
+ /// IDaoManager daoManager = DaoManager.GetInstance("PetStore");
/// ICategoryDao categoryDao = (ICategoryDao) daoManager.GetDao("Category");
/// IProductDao productDao = (IProductDao) daoManager.GetDao("Product");
/// daoManager.BeginTransaction();
@@ -108,7 +108,7 @@
///</remarks>
protected static HybridDictionary DaoContextMap = new HybridDictionary();
- private DataSource _dataSource = null;
+ private IDataSource _dataSource = null;
private IDbProvider _provider = null;
private string _name = string.Empty;
private IDaoSessionHandler _daoSessionHandler = null;
@@ -129,7 +129,7 @@
/// <summary>
///
/// </summary>
- internal DataSource DataSource
+ internal IDataSource DataSource
{
get { return _dataSource; }
set { _dataSource = value; }
@@ -148,7 +148,7 @@
/// Gets the local data source.
/// </summary>
/// <value>The local data source.</value>
- public DataSource LocalDataSource
+ public IDataSource LocalDataSource
{
get { return _dataSource; }
}
@@ -315,7 +315,7 @@
/// Gets the default DaoManager.
/// </summary>
/// <returns>A DaoManager.</returns>
- public static DaoManager GetInstance()
+ public static IDaoManager GetInstance()
{
return (DaoManager)DaoContextMap[DEFAULT_CONTEXT_NAME];
}
@@ -325,7 +325,7 @@
/// </summary>
/// <param name="contextName">The name of the DaoManger.</param>
/// <returns>A DaoManager.</returns>
- public static DaoManager GetInstance(string contextName)
+ public static IDaoManager GetInstance(string contextName)
{
return (DaoManager) DaoContextMap[contextName];
}
@@ -335,7 +335,7 @@
/// </summary>
/// <param name="dao">A Dao instance.</param>
/// <returns>A DaoManager</returns>
- public static DaoManager GetInstance(IDao dao)
+ public static IDaoManager GetInstance(IDao dao)
{
Dao daoImplementation = _daoImplementationMap[dao] as Dao;
return daoImplementation.DaoManager;
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IDaoManager.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IDaoManager.cs?rev=417844&r1=417843&r2=417844&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IDaoManager.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IDaoManager.cs Wed Jun 28 11:49:05 2006
@@ -97,7 +97,7 @@
/// Gets the local data source.
/// </summary>
/// <value>The local data source.</value>
- DataSource LocalDataSource { get; }
+ IDataSource LocalDataSource { get; }
/// <summary>