You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by bg...@apache.org on 2007/02/13 18:05:56 UTC
svn commit: r507103 - in /ibatis/trunk/java/mapper/mapper2:
devlib/hsqldb-1.8.0.7.jar devlib/hsqldb.jar
test/com/ibatis/common/resources/ResourcesTest.java
test/com/ibatis/sqlmap/ParameterMapTest.java
Author: bgoodin
Date: Tue Feb 13 09:05:55 2007
New Revision: 507103
URL: http://svn.apache.org/viewvc?view=rev&rev=507103
Log:
- Updated the hsqldb jar and a unit test that depended on a specific sql exception from hsqldb.
- Updated TestCL to use the threads ClassLoader as it's parent to avoid classloading issues when running a prototype build with Maven. Figure it wouldn't hurt to commit the change because it sill works in Ant build.
Added:
ibatis/trunk/java/mapper/mapper2/devlib/hsqldb-1.8.0.7.jar (with props)
Removed:
ibatis/trunk/java/mapper/mapper2/devlib/hsqldb.jar
Modified:
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/common/resources/ResourcesTest.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/ParameterMapTest.java
Added: ibatis/trunk/java/mapper/mapper2/devlib/hsqldb-1.8.0.7.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/devlib/hsqldb-1.8.0.7.jar?view=auto&rev=507103
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/devlib/hsqldb-1.8.0.7.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/common/resources/ResourcesTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/common/resources/ResourcesTest.java?view=diff&rev=507103&r1=507102&r2=507103
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/common/resources/ResourcesTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/common/resources/ResourcesTest.java Tue Feb 13 09:05:55 2007
@@ -40,7 +40,7 @@
}
public void testSetDefaultClassLoader() {
- ClassLoader classLoader = new TestCL();
+ ClassLoader classLoader = new TestCL(this.getClass().getClassLoader());
ClassLoader tmp = Resources.getDefaultClassLoader();
Resources.setDefaultClassLoader(classLoader);
assertEquals(classLoader, Resources.getDefaultClassLoader());
@@ -84,7 +84,7 @@
URL url;
ClassLoader classLoader;
- classLoader = new TestCL();
+ classLoader = new TestCL(this.getClass().getClassLoader());
resourceName = "java/lang/String.class";
url = null;
isUsingPrivateClassloader = false;
@@ -147,7 +147,7 @@
String resourceName;
ClassLoader classLoader;
- classLoader = new TestCL();
+ classLoader = new TestCL(this.getClass().getClassLoader());
resourceName = "java/lang/String.class";
inputStream = null;
isUsingPrivateClassloader = false;
@@ -217,7 +217,7 @@
String testProp2 = "name2";
String testPropValue2 = "value2";
Properties properties;
- ClassLoader classLoader = new TestCL();
+ ClassLoader classLoader = new TestCL(this.getClass().getClassLoader());
resourceName = "com/ibatis/common/resources/resourcestest.properties";
properties = null;
@@ -298,7 +298,13 @@
/* A stupid simple classloader for testing
*/
private class TestCL extends ClassLoader {
- public synchronized void clearAssertionStatus() {
+
+
+ public TestCL(ClassLoader parent) {
+ super(parent);
+ }
+
+ public synchronized void clearAssertionStatus() {
isUsingPrivateClassloader = true;
super.clearAssertionStatus();
}
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/ParameterMapTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/ParameterMapTest.java?view=diff&rev=507103&r1=507102&r2=507103
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/ParameterMapTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/ParameterMapTest.java Tue Feb 13 09:05:55 2007
@@ -54,7 +54,7 @@
assertNotNull(expected);
- assertTrue(expected.getMessage().indexOf("Try to insert null into a non-nullable column: column: ACC_ID table: ACCOUNT in statement") > -1);
+ assertTrue(expected.getMessage().indexOf("Attempt to insert null into a non-nullable column: column: ACC_ID table: ACCOUNT in statement") > -1);
assertNull(account);
}