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 2005/05/09 19:34:44 UTC
svn commit: r169339 - in
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper: ./
Test/NUnit/SqlMapTests/ Test/bin/Debug/
Author: gbayon
Date: Mon May 9 10:34:41 2005
New Revision: 169339
URL: http://svn.apache.org/viewcvs?rev=169339&view=rev
Log:
- Fixed JIRA-IBATISNET-60 + fixed log4Net output in Nunit test
Modified:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapper.cs
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs?rev=169339&r1=169338&r2=169339&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs Mon May 9 10:34:41 2005
@@ -1,16 +1,22 @@
using System;
using System.Collections;
-using System.Configuration;
+using System.Data;
using System.IO;
-using IBatisNet.Common;
-using IBatisNet.Common.Utilities;
-using IBatisNet.DataMapper.Test.Domain;
-using log4net.Config;
+using System.Reflection;
+using System.Configuration;
+
+using log4net;
+
using NUnit.Framework;
+using IBatisNet.Common; // DataSource definition
+using IBatisNet.Common.Utilities; // ScriptRunner definition
+using IBatisNet.DataMapper; // SqlMap API
+using IBatisNet.DataMapper.Test.Domain;
+
-[assembly : DOMConfigurator(Watch=true)]
+[assembly : log4net.Config.DOMConfigurator(Watch=true)]
namespace IBatisNet.DataMapper.Test.NUnit.SqlMapTests
{
@@ -23,6 +29,7 @@
/// The sqlMap
/// </summary>
protected static SqlMapper sqlMap;
+ private static readonly ILog _logger = LogManager.GetLogger( System.Reflection.MethodBase.GetCurrentMethod().DeclaringType );
protected static string ScriptDirectory = null;
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config?rev=169339&r1=169338&r2=169339&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config Mon May 9 10:34:41 2005
@@ -57,10 +57,10 @@
<level value="DEBUG" />
</logger>
<logger name="IBatisNet.DataMapper.Configuration.Statements.PreparedStatementFactory">
- <level value="DEBUG" />
+ <level value="OFF" />
</logger>
<logger name="IBatisNet.DataMapper.Commands.IPreparedCommand">
- <level value="DEBUG" />
+ <level value="OFF" />
</logger>
<logger name="IBatisNet.DataMapper.LazyLoadList">
<level value="DEBUG" />
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapper.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapper.cs?rev=169339&r1=169338&r2=169339&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapper.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapper.cs Mon May 9 10:34:41 2005
@@ -640,11 +640,14 @@
}
catch
{
+ throw;
+ }
+ finally
+ {
if ( isSessionLocal )
{
session.CloseConnection();
}
- throw;
}
return map;