Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml Thu Jan 22 22:32:36 2009 @@ -7,39 +7,39 @@ <mapper namespace="com.domain.BlogMapper"> <resultMap id="blogWithPosts" type="Blog"> - <id property="id" column="id" /> - <result property="title" column="title" /> + <id property="id" column="id"/> + <result property="title" column="title"/> <association property="author" column="author_id" select="com.domain.AuthorMapper.selectAuthorWithInlineParams"/> - <collection property="posts" column="id" select="selectPostsForBlog" /> + <collection property="posts" column="id" select="selectPostsForBlog"/> </resultMap> <select id="selectBlogWithPostsUsingSubSelect" parameterType="int" resultMap="blogWithPosts"> select * from Blog where id = #{id} </select> - - <select id="selectPostsForBlog" parameterType="int" resultType="Post" > + + <select id="selectPostsForBlog" parameterType="int" resultType="Post"> select * from Post where blog_id = #{blog_id} </select> <resultMap id="joinedAuthor" type="domain.blog.Author"> - <id property="id" column="author_id" /> - <result property="username" column="author_username" /> - <result property="password" column="author_password" /> - <result property="email" column="author_email" /> - <result property="bio" column="author_bio" /> - <result property="favouriteSection" column="author_favourite_section" /> + <id property="id" column="author_id"/> + <result property="username" column="author_username"/> + <result property="password" column="author_password"/> + <result property="email" column="author_email"/> + <result property="bio" column="author_bio"/> + <result property="favouriteSection" column="author_favourite_section"/> </resultMap> <resultMap id="joinedComment" type="domain.blog.Comment"> - <id property="id" column="comment_id" /> + <id property="id" column="comment_id"/> </resultMap> <resultMap id="joinedTag" type="domain.blog.Tag"> - <id property="id" column="tag_id" /> + <id property="id" column="tag_id"/> </resultMap> <resultMap id="joinedPost" type="domain.blog.Post"> - <id property="id" column="post_id" /> + <id property="id" column="post_id"/> <result property="subject" column="post_subject"/> <association property="author" column="post_author_id" resultMap="joinedAuthor"/> <collection property="comments" column="post_id" resultMap="joinedComment"/> @@ -52,37 +52,37 @@ <resultMap id="draftPost" type="domain.blog.DraftPost" extends="joinedPost"/> <resultMap id="blogJoinedWithPostsAndAuthor" type="Blog"> - <id property="id" column="blog_id" /> + <id property="id" column="blog_id"/> <result property="title" column="blog_title"/> <association property="author" column="blog_author_id" resultMap="joinedAuthor"/> - <collection property="posts" resultMap="joinedPost" /> + <collection property="posts" resultMap="joinedPost"/> </resultMap> <select id="selectBlogJoinedWithPostsAndAuthor" parameterType="int" resultMap="blogJoinedWithPostsAndAuthor"> select - B.id as blog_id, - B.title as blog_title, - B.author_id as blog_author_id, - A.id as author_id, - A.username as author_username, - A.password as author_password, - A.email as author_email, - A.bio as author_bio, - A.favourite_section as author_favourite_section, - P.id as post_id, - P.blog_id as post_blog_id, - P.author_id as post_author_id, - P.created_on as post_created_on, - P.section as post_section, - P.subject as post_subject, - P.draft as draft, - P.body as post_body, - C.id as comment_id, - C.post_id as comment_post_id, - C.name as comment_name, - C.comment as comment_text, - T.id as tag_id, - T.name as tag_name + B.id as blog_id, + B.title as blog_title, + B.author_id as blog_author_id, + A.id as author_id, + A.username as author_username, + A.password as author_password, + A.email as author_email, + A.bio as author_bio, + A.favourite_section as author_favourite_section, + P.id as post_id, + P.blog_id as post_blog_id, + P.author_id as post_author_id, + P.created_on as post_created_on, + P.section as post_section, + P.subject as post_subject, + P.draft as draft, + P.body as post_body, + C.id as comment_id, + C.post_id as comment_post_id, + C.name as comment_name, + C.comment as comment_text, + T.id as tag_id, + T.name as tag_name from Blog B left outer join Author A on B.author_id = A.id left outer join Post P on B.id = P.blog_id
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleMapper.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleMapper.xml?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleMapper.xml (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleMapper.xml Thu Jan 22 22:32:36 2009 @@ -14,14 +14,14 @@ <parameterMap id="" type=""> <parameter property="id" javaType="" jdbcType="" typeHandler="" - mode="IN" scale="" resultMap=""/> + mode="IN" scale="" resultMap=""/> <parameter property="dept" javaType="" jdbcType="" typeHandler="" - mode="IN" scale="" resultMap=""/> + mode="IN" scale="" resultMap=""/> </parameterMap> <resultMap id="" type="" extends=""> <constructor> - <id column="" javaType="" jdbcType="" typeHandler="" /> + <id column="" javaType="" jdbcType="" typeHandler=""/> <result column="" javaType="" jdbcType="" typeHandler=""/> </constructor> <result property="" column="" javaType="" jdbcType="" typeHandler=""/> Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleObjectFactory.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleObjectFactory.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleObjectFactory.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleObjectFactory.java Thu Jan 22 22:32:36 2009 @@ -12,7 +12,7 @@ } public Object create(Class type, List<Class> constructorArgTypes, List<Object> constructorArgs) { - return super.create(type,constructorArgTypes,constructorArgs); + return super.create(type, constructorArgTypes, constructorArgs); } public void setProperties(Properties properties) { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExamplePlugin.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExamplePlugin.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExamplePlugin.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExamplePlugin.java Thu Jan 22 22:32:36 2009 @@ -1,9 +1,9 @@ package org.apache.ibatis.parser; import org.apache.ibatis.plugin.Interceptor; +import org.apache.ibatis.plugin.Intercepts; import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Plugin; -import org.apache.ibatis.plugin.Intercepts; import java.util.Properties; @@ -15,7 +15,7 @@ } public Object plugin(Object target) { - return Plugin.wrap(target,this); + return Plugin.wrap(target, this); } public void setProperties(Properties properties) { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleTypeHandler.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleTypeHandler.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleTypeHandler.java Thu Jan 22 22:32:36 2009 @@ -1,17 +1,17 @@ package org.apache.ibatis.parser; -import org.apache.ibatis.type.TypeHandler; import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.TypeHandler; +import java.sql.CallableStatement; import java.sql.PreparedStatement; -import java.sql.SQLException; import java.sql.ResultSet; -import java.sql.CallableStatement; +import java.sql.SQLException; public class ExampleTypeHandler implements TypeHandler { public void setParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { - ps.setString(i,(String)parameter); + ps.setString(i, (String) parameter); } public Object getResult(ResultSet rs, String columnName) throws SQLException { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/MapperConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/MapperConfig.xml?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/MapperConfig.xml (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/MapperConfig.xml Thu Jan 22 22:32:36 2009 @@ -20,7 +20,7 @@ <setting name="defaultExecutorType" value="SIMPLE"/> <setting name="defaultStatementTimeout" value="25000"/> </settings> - + <typeAliases> <typeAlias alias="Author" type="domain.blog.Author"/> <typeAlias alias="Blog" type="domain.blog.Blog"/> @@ -31,7 +31,7 @@ </typeAliases> <typeHandlers> - <typeHandler javaType="String" jdbcType="VARCHAR" handler="org.apache.ibatis.parser.ExampleTypeHandler" /> + <typeHandler javaType="String" jdbcType="VARCHAR" handler="org.apache.ibatis.parser.ExampleTypeHandler"/> </typeHandlers> <objectFactory type="org.apache.ibatis.parser.ExampleObjectFactory"> Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/plugin/PluginTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/plugin/PluginTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/plugin/PluginTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/plugin/PluginTest.java Thu Jan 22 22:32:36 2009 @@ -1,10 +1,12 @@ package org.apache.ibatis.plugin; -import org.junit.*; - -import java.util.*; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; public class PluginTest { @@ -23,7 +25,7 @@ } @Intercepts({ - @Signature(type = Map.class, method = "get", args = {Object.class})}) + @Signature(type = Map.class, method = "get", args = {Object.class})}) public static class AlwaysMapPlugin implements Interceptor { public Object intercept(Invocation invocation) throws Throwable { return "Always"; Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/ExceptionUtilTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/ExceptionUtilTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/ExceptionUtilTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/ExceptionUtilTest.java Thu Jan 22 22:32:36 2009 @@ -1,9 +1,10 @@ package org.apache.ibatis.reflection; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; -import java.lang.reflect.*; -import static org.junit.Assert.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.UndeclaredThrowableException; public class ExceptionUtilTest { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaClassTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaClassTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaClassTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaClassTest.java Thu Jan 22 22:32:36 2009 @@ -2,10 +2,12 @@ import domain.misc.RichType; import domain.misc.generics.GenericConcrete; -import org.junit.*; - -import java.util.*; import static org.junit.Assert.*; +import org.junit.Test; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class MetaClassTest { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java Thu Jan 22 22:32:36 2009 @@ -2,8 +2,8 @@ import domain.jpetstore.Product; import domain.misc.RichType; -import org.junit.*; import static org.junit.Assert.*; +import org.junit.Test; public class MetaObjectTest { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java Thu Jan 22 22:32:36 2009 @@ -3,7 +3,9 @@ import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public abstract class BaseTypeHandlerTest { Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BigDecimalTypeHandlerTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BigDecimalTypeHandlerTest.java?rev=736963&r1=736962&r2=736963&view=diff ============================================================================== --- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BigDecimalTypeHandlerTest.java (original) +++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/type/BigDecimalTypeHandlerTest.java Thu Jan 22 22:32:36 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.math.BigDecimal; -import static org.junit.Assert.*; public class BigDecimalTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,11 +1,11 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertArrayEquals; +import org.junit.Test; import java.io.InputStream; import java.sql.Blob; -import static org.junit.Assert.*; public class BlobTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class BooleanTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import org.junit.Test; public class ByteArrayTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class ByteTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,11 +1,11 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.io.Reader; import java.sql.Clob; -import static org.junit.Assert.*; public class ClobTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,11 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; -import static org.junit.Assert.*; public class DateOnlyTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,11 +1,11 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.sql.Timestamp; import java.util.Date; -import static org.junit.Assert.*; public class DateTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class DoubleTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class FloatTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class IntegerTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class LongTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class ObjectTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class ShortTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,9 @@ package org.apache.ibatis.type; import domain.misc.RichType; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; public class SimpleTypeRegistryTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; public class SqlDateTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; public class SqlTimeTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; public class SqlTimetampTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class StringTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; public class TimeOnlyTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,7 +1,7 @@ package org.apache.ibatis.type; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class TypeAliasRegistryTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import domain.misc.RichType; -import org.junit.*; import static org.junit.Assert.*; +import org.junit.Test; public class TypeHandlerRegistryTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,8 +1,8 @@ package org.apache.ibatis.type; import org.jmock.Expectations; -import org.junit.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; public class UnknownTypeHandlerTest extends BaseTypeHandlerTest { 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -1,17 +1,20 @@ package org.apache.ibatis.xml; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; -import java.util.*; -import static org.junit.Assert.*; +import java.util.HashMap; +import java.util.Map; public class GenericTokenParserTest { public static class VariableTokenHandler implements GenericTokenParser.TokenHandler { - private Map<String,String> variables = new HashMap<String,String>(); + private Map<String, String> variables = new HashMap<String, String>(); + public VariableTokenHandler(Map<String, String> variables) { this.variables = variables; } + public String handleToken(String content) { return variables.get(content); } @@ -19,21 +22,23 @@ @Test public void shouldDemonstrateGenericTokenReplacement() { - GenericTokenParser parser = new GenericTokenParser("${","}",new VariableTokenHandler(new HashMap<String,String>() {{ - put("first_name","James"); - put("initial","T"); - put("last_name","Kirk"); - }})); - - 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.")); + GenericTokenParser parser = new GenericTokenParser("${", "}", new VariableTokenHandler(new HashMap<String, String>() { + { + put("first_name", "James"); + put("initial", "T"); + put("last_name", "Kirk"); + } + })); + + 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=736963&r1=736962&r2=736963&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:32:36 2009 @@ -2,11 +2,12 @@ import domain.misc.Employee; import org.apache.ibatis.io.Resources; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.io.Reader; -import java.util.*; -import static org.junit.Assert.*; +import java.util.Date; +import java.util.Properties; public class NodeletParserTest {
