You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by ro...@apache.org on 2005/03/07 03:57:30 UTC

svn commit: r156377 - in incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test: NUnit/CommonTests/Transaction/ bin/Debug/

Author: roberto
Date: Sun Mar  6 18:57:28 2005
New Revision: 156377

URL: http://svn.apache.org/viewcvs?view=rev&rev=156377
Log:
~ Updated Common NUnit BaseTest.cs for resource loading change made in SVN Rev 156239
~ Updated Common NUnit test SqlMaps for relative paths

Modified:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/NUnit/CommonTests/Transaction/BaseTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MySql_ByteFx.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/NUnit/CommonTests/Transaction/BaseTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/NUnit/CommonTests/Transaction/BaseTest.cs?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/NUnit/CommonTests/Transaction/BaseTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/NUnit/CommonTests/Transaction/BaseTest.cs Sun Mar  6 18:57:28 2005
@@ -49,9 +49,10 @@
 		static BaseTest()
 		{
 
-			ScriptDirectory = Resources.RootDirectory + Path.DirectorySeparatorChar +
-				"Scripts" + Path.DirectorySeparatorChar +
-				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
+			ScriptDirectory = Path.Combine(
+				Path.Combine(
+				Path.Combine(
+				Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationSettings.AppSettings["database"]) + Path.DirectorySeparatorChar;
 		}
 
 		/// <summary>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config Sun Mar  6 18:57:28 2005
@@ -7,7 +7,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="Database.config"/>
+	<properties resource="../../Database.config"/>
 		
 	<!-- ==== OleDb configuration =========	-->
 	<database>
@@ -20,7 +20,7 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\Access\OleDb\Account.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Account.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Sun Mar  6 18:57:28 2005
@@ -6,7 +6,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 
 	<!-- ==== Odbc configuration =========	-->
 	<database>	
@@ -20,7 +20,7 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\MSSQL\Odbc\Account.xml"/>
+		<sqlMap resource="../Maps/MSSQL/Odbc/Account.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Sun Mar  6 18:57:28 2005
@@ -7,7 +7,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 		
 	<!-- ==== OleDb configuration =========	-->
 	<database>
@@ -20,7 +20,7 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\MSSQL\OleDb\Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Account.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Sun Mar  6 18:57:28 2005
@@ -6,7 +6,7 @@
 	</settings>
 
 	<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 	<!-- <properties embedded="database.config, IBatisNet.Test"/> -->
 
 	<!-- ==== SqlClient configuration =========	-->
@@ -21,7 +21,7 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/MSSQL/SqlClient/Account.xml"/> ok -->
-		<sqlMap resource="Maps/MSSQL/SqlClient/Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Account.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MySql_ByteFx.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MySql_ByteFx.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MySql_ByteFx.config Sun Mar  6 18:57:28 2005
@@ -6,7 +6,7 @@
 	</settings>
 
 	<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
-	<properties resource="Database.config"/>
+	<properties resource="../../Database.config"/>
 	<!-- <properties embedded="database.config, IBatisNet.Test"/> -->
 
 	<!-- ==== OracleClient configuration =========	-->
@@ -21,7 +21,7 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/MySql/ByteFx/Account.xml"/> ok -->
-		<sqlMap resource="Maps/MySql/ByteFx/Account.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Account.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config Sun Mar  6 18:57:28 2005
@@ -6,7 +6,7 @@
 	</settings>
 
 	<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
-	<properties resource="Database.config"/>
+	<properties resource="../../Database.config"/>
 	<!-- <properties embedded="database.config, IBatisNet.Test"/> -->
 
 	<!-- ==== ODP configuration =========	-->
@@ -21,7 +21,7 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/Oracle/ODP/Account.xml"/> ok -->
-		<sqlMap resource="Maps/Oracle/ODP/Account.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Account.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?view=diff&r1=156376&r2=156377
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config Sun Mar  6 18:57:28 2005
@@ -6,7 +6,7 @@
 	</settings>
 
 	<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
-	<properties resource="Database.config"/>
+	<properties resource="../../Database.config"/>
 	<!-- <properties embedded="database.config, IBatisNet.Test"/> -->
 
 	<!-- ==== OracleClient configuration =========	-->
@@ -21,7 +21,7 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/Oracle/OracleClient/Account.xml"/> ok -->
-		<sqlMap resource="Maps/Oracle/OracleClient/Account.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Account.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->