svn commit: r736961 [2/2] - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis: api/ cache/ executor/ io/ jdbc/ logging/ metadata/ migration/ plugin/ reflection/ type/ xml/

[cb...@apache.org]

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -5,6 +5,7 @@
 
 import java.io.InputStream;
 import java.sql.Blob;
+import static org.junit.Assert.*;
 
 public class BlobTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -39,7 +40,7 @@
         will(returnValue(new byte[]{1, 2, 3}));
       }
     });
-    Assert.assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(rs, "column"));
+    assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -58,7 +59,7 @@
         will(returnValue(new byte[]{1, 2, 3}));
       }
     });
-    Assert.assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(cs, 1));
+    assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class BooleanTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(true, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(true, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(true, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(true, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteArrayTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteArrayTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteArrayTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteArrayTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class ByteArrayTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(rs, "column"));
+    assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(cs, 1));
+    assertArrayEquals(new byte[]{1, 2, 3}, (byte[]) TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class ByteTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals((byte) 100, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals((byte) 100, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals((byte) 100, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals((byte) 100, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -5,6 +5,7 @@
 
 import java.io.Reader;
 import java.sql.Clob;
+import static org.junit.Assert.*;
 
 public class ClobTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -39,7 +40,7 @@
         will(returnValue("Hello"));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -58,7 +59,7 @@
         will(returnValue("Hello"));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
+    assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateOnlyTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateOnlyTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateOnlyTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateOnlyTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -4,6 +4,8 @@
 import org.junit.*;
 
 import java.util.Date;
+import static org.junit.Assert.*;
+import static org.junit.Assert.*;
 
 public class DateOnlyTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -34,7 +36,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -49,7 +51,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DateTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -5,6 +5,7 @@
 
 import java.sql.Timestamp;
 import java.util.Date;
+import static org.junit.Assert.*;
 
 public class DateTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -35,7 +36,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -50,7 +51,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class DoubleTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100d, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(100d, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100d, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(100d, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class FloatTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100f, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(100f, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100f, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(100f, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class IntegerTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(100, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(100, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class LongTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100l, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(100l, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(100l, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(100l, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ObjectTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ObjectTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ObjectTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ObjectTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class ObjectTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
+    assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class ShortTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals((short) 100, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals((short) 100, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals((short) 100, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals((short) 100, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java Thu Jan 22 22:22:08 2009
@@ -2,17 +2,18 @@
 
 import domain.misc.RichType;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class SimpleTypeRegistryTest {
 
   @Test
   public void shouldTestIfClassIsSimpleTypeAndReturnTrue() {
-    Assert.assertTrue(SimpleTypeRegistry.isSimpleType(String.class));
+    assertTrue(SimpleTypeRegistry.isSimpleType(String.class));
   }
 
   @Test
   public void shouldTestIfClassIsSimpleTypeAndReturnFalse() {
-    Assert.assertFalse(SimpleTypeRegistry.isSimpleType(RichType.class));
+    assertFalse(SimpleTypeRegistry.isSimpleType(RichType.class));
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlDateTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlDateTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlDateTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlDateTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -4,6 +4,7 @@
 import org.junit.*;
 
 import java.util.Date;
+import static org.junit.Assert.*;
 
 public class SqlDateTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -33,7 +34,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_DATE, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(SQL_DATE, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -48,7 +49,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_DATE, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(SQL_DATE, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimeTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimeTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimeTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimeTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -4,6 +4,7 @@
 import org.junit.*;
 
 import java.util.Date;
+import static org.junit.Assert.*;
 
 public class SqlTimeTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -33,7 +34,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_TIME, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(SQL_TIME, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -48,7 +49,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_TIME, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(SQL_TIME, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -4,6 +4,7 @@
 import org.junit.*;
 
 import java.util.Date;
+import static org.junit.Assert.*;
 
 public class SqlTimetampTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -33,7 +34,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_TIME, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(SQL_TIME, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -48,7 +49,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(SQL_TIME, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(SQL_TIME, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/StringTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/StringTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/StringTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/StringTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class StringTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -42,7 +43,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -57,7 +58,7 @@
         will(returnValue(true));
       }
     });
-    Assert.assertEquals(null, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(null, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -72,7 +73,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
+    assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 
@@ -87,7 +88,7 @@
         will(returnValue(true));
       }
     });
-    Assert.assertEquals(null, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(null, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TimeOnlyTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TimeOnlyTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TimeOnlyTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TimeOnlyTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -4,6 +4,7 @@
 import org.junit.*;
 
 import java.util.Date;
+import static org.junit.Assert.*;
 
 public class TimeOnlyTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -34,7 +35,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals(DATE, TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -49,7 +50,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
+    assertEquals(DATE, TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeAliasRegistryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeAliasRegistryTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeAliasRegistryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeAliasRegistryTest.java Thu Jan 22 22:22:08 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.type;
 
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class TypeAliasRegistryTest {
 
@@ -10,8 +11,8 @@
 
     typeAliasRegistry.registerAlias("rich", "domain.misc.RichType");
 
-    Assert.assertEquals("domain.misc.RichType", typeAliasRegistry.resolveAlias("rich"));
-    Assert.assertEquals("unknown", typeAliasRegistry.resolveAlias("unknown"));
+    assertEquals("domain.misc.RichType", typeAliasRegistry.resolveAlias("rich"));
+    assertEquals("unknown", typeAliasRegistry.resolveAlias("unknown"));
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import domain.misc.RichType;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class TypeHandlerRegistryTest {
 
@@ -11,13 +12,13 @@
   public void shouldRegisterAndRetrieveTypeHandler() {
     TypeHandler stringTypeHandler = typeHandlerRegistry.getTypeHandler(String.class);
     typeHandlerRegistry.register(String.class, JdbcType.LONGVARCHAR, stringTypeHandler);
-    Assert.assertEquals(stringTypeHandler, typeHandlerRegistry.getTypeHandler(String.class, JdbcType.LONGVARCHAR));
+    assertEquals(stringTypeHandler, typeHandlerRegistry.getTypeHandler(String.class, JdbcType.LONGVARCHAR));
 
-    Assert.assertTrue(typeHandlerRegistry.hasTypeHandler(String.class));
-    Assert.assertFalse(typeHandlerRegistry.hasTypeHandler(RichType.class));
-    Assert.assertTrue(typeHandlerRegistry.hasTypeHandler(String.class, JdbcType.LONGVARCHAR));
-    Assert.assertTrue(typeHandlerRegistry.hasTypeHandler(String.class, JdbcType.INTEGER));
-    Assert.assertTrue(typeHandlerRegistry.getUnkownTypeHandler() instanceof UnknownTypeHandler);
+    assertTrue(typeHandlerRegistry.hasTypeHandler(String.class));
+    assertFalse(typeHandlerRegistry.hasTypeHandler(RichType.class));
+    assertTrue(typeHandlerRegistry.hasTypeHandler(String.class, JdbcType.LONGVARCHAR));
+    assertTrue(typeHandlerRegistry.hasTypeHandler(String.class, JdbcType.INTEGER));
+    assertTrue(typeHandlerRegistry.getUnkownTypeHandler() instanceof UnknownTypeHandler);
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java Thu Jan 22 22:22:08 2009
@@ -2,6 +2,7 @@
 
 import org.jmock.Expectations;
 import org.junit.*;
+import static org.junit.Assert.*;
 
 public class UnknownTypeHandlerTest extends BaseTypeHandlerTest {
 
@@ -30,7 +31,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
+    assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column"));
     mockery.assertIsSatisfied();
   }
 
@@ -45,7 +46,7 @@
         will(returnValue(false));
       }
     });
-    Assert.assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
+    assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1));
     mockery.assertIsSatisfied();
   }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/GenericTokenParserTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/GenericTokenParserTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/GenericTokenParserTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/GenericTokenParserTest.java Thu Jan 22 22:22:08 2009
@@ -3,6 +3,7 @@
 import org.junit.*;
 
 import java.util.*;
+import static org.junit.Assert.*;
 
 public class GenericTokenParserTest {
 
@@ -24,15 +25,15 @@
       put("last_name","Kirk");
     }}));
 
-    Assert.assertEquals("James T Kirk reporting.",parser.parse("${first_name} ${initial} ${last_name} reporting."));
-    Assert.assertEquals("Hello captain James T Kirk",parser.parse("Hello captain ${first_name} ${initial} ${last_name}"));
-    Assert.assertEquals("James T Kirk",parser.parse("${first_name} ${initial} ${last_name}"));
-    Assert.assertEquals("JamesTKirk",parser.parse("${first_name}${initial}${last_name}"));
-    Assert.assertEquals("${",parser.parse("${"));
-    Assert.assertEquals("}",parser.parse("}"));
-    Assert.assertEquals("Hello ${ this is a test.",parser.parse("Hello ${ this is a test."));
-    Assert.assertEquals("Hello } this is a test.",parser.parse("Hello } this is a test."));
-    Assert.assertEquals("Hello } ${ this is a test.",parser.parse("Hello } ${ this is a test."));
+    assertEquals("James T Kirk reporting.",parser.parse("${first_name} ${initial} ${last_name} reporting."));
+    assertEquals("Hello captain James T Kirk",parser.parse("Hello captain ${first_name} ${initial} ${last_name}"));
+    assertEquals("James T Kirk",parser.parse("${first_name} ${initial} ${last_name}"));
+    assertEquals("JamesTKirk",parser.parse("${first_name}${initial}${last_name}"));
+    assertEquals("${",parser.parse("${"));
+    assertEquals("}",parser.parse("}"));
+    assertEquals("Hello ${ this is a test.",parser.parse("Hello ${ this is a test."));
+    assertEquals("Hello } this is a test.",parser.parse("Hello } this is a test."));
+    assertEquals("Hello } ${ this is a test.",parser.parse("Hello } ${ this is a test."));
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/NodeletParserTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/NodeletParserTest.java?rev=736961&r1=736960&r2=736961&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/NodeletParserTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/NodeletParserTest.java Thu Jan 22 22:22:08 2009
@@ -6,6 +6,7 @@
 
 import java.io.Reader;
 import java.util.*;
+import static org.junit.Assert.*;
 
 public class NodeletParserTest {
 
@@ -22,14 +23,14 @@
     Reader resource = Resources.getResourceAsReader("resources/nodelet_test.xml");
     parser.parse(resource);
     Employee emp = handler.getEmployee();
-    Assert.assertEquals(1234567890, emp.getId());
-    Assert.assertEquals("Jim", emp.getFirstName());
-    Assert.assertEquals("Smith", emp.getLastName());
-    Assert.assertEquals(new Date(1970 - 1900, 6 - 1, 15), emp.getBirthDate());
-    Assert.assertEquals(5.8, emp.getHeight());
-    Assert.assertEquals("ft", emp.getHeightUnits());
-    Assert.assertEquals(200, emp.getWeight());
-    Assert.assertEquals("lbs", emp.getWeightUnits());
+    assertEquals(1234567890, emp.getId());
+    assertEquals("Jim", emp.getFirstName());
+    assertEquals("Smith", emp.getLastName());
+    assertEquals(new Date(1970 - 1900, 6 - 1, 15), emp.getBirthDate());
+    assertEquals(5.8, emp.getHeight());
+    assertEquals("ft", emp.getHeightUnits());
+    assertEquals(200, emp.getWeight());
+    assertEquals("lbs", emp.getWeightUnits());
   }