You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/10/10 07:45:13 UTC
svn commit: r823796 [4/6] - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src:
main/java/org/apache/ibatis/annotations/
main/java/org/apache/ibatis/binding/ main/java/org/apache/ibatis/builder/
main/java/org/apache/ibatis/builder/annotation/ main/java/o...
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/databases/jpetstore/jpetstore-hsqldb-schema.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/databases/jpetstore/jpetstore-hsqldb-schema.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/databases/jpetstore/jpetstore-hsqldb-schema.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/databases/jpetstore/jpetstore-hsqldb-schema.sql Sat Oct 10 05:45:06 2009
@@ -17,152 +17,152 @@
drop table sequence if exists;
create table supplier (
- suppid int not null,
- name varchar(80) null,
- status varchar(2) not null,
- addr1 varchar(80) null,
- addr2 varchar(80) null,
- city varchar(80) null,
- state varchar(80) null,
- zip varchar(5) null,
- phone varchar(80) null,
- constraint pk_supplier primary key (suppid)
+suppid int not null,
+name varchar(80) null,
+status varchar(2) not null,
+addr1 varchar(80) null,
+addr2 varchar(80) null,
+city varchar(80) null,
+state varchar(80) null,
+zip varchar(5) null,
+phone varchar(80) null,
+constraint pk_supplier primary key (suppid)
);
create table signon (
- username varchar(25) not null,
- password varchar(25) not null,
- constraint pk_signon primary key (username)
+username varchar(25) not null,
+password varchar(25) not null,
+constraint pk_signon primary key (username)
);
create table account (
- userid varchar(80) not null,
- email varchar(80) not null,
- firstname varchar(80) not null,
- lastname varchar(80) not null,
- status varchar(2) null,
- addr1 varchar(80) not null,
- addr2 varchar(40) null,
- city varchar(80) not null,
- state varchar(80) not null,
- zip varchar(20) not null,
- country varchar(20) not null,
- phone varchar(80) not null,
- constraint pk_account primary key (userid)
+userid varchar(80) not null,
+email varchar(80) not null,
+firstname varchar(80) not null,
+lastname varchar(80) not null,
+status varchar(2) null,
+addr1 varchar(80) not null,
+addr2 varchar(40) null,
+city varchar(80) not null,
+state varchar(80) not null,
+zip varchar(20) not null,
+country varchar(20) not null,
+phone varchar(80) not null,
+constraint pk_account primary key (userid)
);
create table profile (
- userid varchar(80) not null,
- langpref varchar(80) not null,
- favcategory varchar(30),
- mylistopt int,
- banneropt int,
- constraint pk_profile primary key (userid)
+userid varchar(80) not null,
+langpref varchar(80) not null,
+favcategory varchar(30),
+mylistopt int,
+banneropt int,
+constraint pk_profile primary key (userid)
);
create table bannerdata (
- favcategory varchar(80) not null,
- bannername varchar(255) null,
- constraint pk_bannerdata primary key (favcategory)
+favcategory varchar(80) not null,
+bannername varchar(255) null,
+constraint pk_bannerdata primary key (favcategory)
);
create table orders (
- orderid int not null,
- userid varchar(80) not null,
- orderdate date not null,
- shipaddr1 varchar(80) not null,
- shipaddr2 varchar(80) null,
- shipcity varchar(80) not null,
- shipstate varchar(80) not null,
- shipzip varchar(20) not null,
- shipcountry varchar(20) not null,
- billaddr1 varchar(80) not null,
- billaddr2 varchar(80) null,
- billcity varchar(80) not null,
- billstate varchar(80) not null,
- billzip varchar(20) not null,
- billcountry varchar(20) not null,
- courier varchar(80) not null,
- totalprice decimal(10,2) not null,
- billtofirstname varchar(80) not null,
- billtolastname varchar(80) not null,
- shiptofirstname varchar(80) not null,
- shiptolastname varchar(80) not null,
- creditcard varchar(80) not null,
- exprdate varchar(7) not null,
- cardtype varchar(80) not null,
- locale varchar(80) not null,
- constraint pk_orders primary key (orderid)
+orderid int not null,
+userid varchar(80) not null,
+orderdate date not null,
+shipaddr1 varchar(80) not null,
+shipaddr2 varchar(80) null,
+shipcity varchar(80) not null,
+shipstate varchar(80) not null,
+shipzip varchar(20) not null,
+shipcountry varchar(20) not null,
+billaddr1 varchar(80) not null,
+billaddr2 varchar(80) null,
+billcity varchar(80) not null,
+billstate varchar(80) not null,
+billzip varchar(20) not null,
+billcountry varchar(20) not null,
+courier varchar(80) not null,
+totalprice decimal(10,2) not null,
+billtofirstname varchar(80) not null,
+billtolastname varchar(80) not null,
+shiptofirstname varchar(80) not null,
+shiptolastname varchar(80) not null,
+creditcard varchar(80) not null,
+exprdate varchar(7) not null,
+cardtype varchar(80) not null,
+locale varchar(80) not null,
+constraint pk_orders primary key (orderid)
);
create table orderstatus (
- orderid int not null,
- linenum int not null,
- timestamp date not null,
- status varchar(2) not null,
- constraint pk_orderstatus primary key (orderid, linenum)
+orderid int not null,
+linenum int not null,
+timestamp date not null,
+status varchar(2) not null,
+constraint pk_orderstatus primary key (orderid, linenum)
);
create table lineitem (
- orderid int not null,
- linenum int not null,
- itemid varchar(10) not null,
- quantity int not null,
- unitprice decimal(10,2) not null,
- constraint pk_lineitem primary key (orderid, linenum)
+orderid int not null,
+linenum int not null,
+itemid varchar(10) not null,
+quantity int not null,
+unitprice decimal(10,2) not null,
+constraint pk_lineitem primary key (orderid, linenum)
);
create table category (
- catid varchar(10) not null,
- name varchar(80) null,
- descn varchar(255) null,
- constraint pk_category primary key (catid)
+catid varchar(10) not null,
+name varchar(80) null,
+descn varchar(255) null,
+constraint pk_category primary key (catid)
);
create table product (
- productid varchar(10) not null,
- category varchar(10) not null,
- name varchar(80) null,
- descn varchar(255) null,
- constraint pk_product primary key (productid),
- constraint fk_product_1 foreign key (category)
- references category (catid)
+productid varchar(10) not null,
+category varchar(10) not null,
+name varchar(80) null,
+descn varchar(255) null,
+constraint pk_product primary key (productid),
+constraint fk_product_1 foreign key (category)
+references category (catid)
);
create index productCat on product (category);
create index productName on product (name);
create table item (
- itemid varchar(10) not null,
- productid varchar(10) not null,
- listprice decimal(10,2) null,
- unitcost decimal(10,2) null,
- supplier int null,
- status varchar(2) null,
- attr1 varchar(80) null,
- attr2 varchar(80) null,
- attr3 varchar(80) null,
- attr4 varchar(80) null,
- attr5 varchar(80) null,
- constraint pk_item primary key (itemid),
- constraint fk_item_1 foreign key (productid)
- references product (productid),
- constraint fk_item_2 foreign key (supplier)
- references supplier (suppid)
+itemid varchar(10) not null,
+productid varchar(10) not null,
+listprice decimal(10,2) null,
+unitcost decimal(10,2) null,
+supplier int null,
+status varchar(2) null,
+attr1 varchar(80) null,
+attr2 varchar(80) null,
+attr3 varchar(80) null,
+attr4 varchar(80) null,
+attr5 varchar(80) null,
+constraint pk_item primary key (itemid),
+constraint fk_item_1 foreign key (productid)
+references product (productid),
+constraint fk_item_2 foreign key (supplier)
+references supplier (suppid)
);
create index itemProd on item (productid);
create table inventory (
- itemid varchar(10) not null,
- qty int not null,
- constraint pk_inventory primary key (itemid)
+itemid varchar(10) not null,
+qty int not null,
+constraint pk_inventory primary key (itemid)
);
CREATE TABLE sequence
(
- name varchar(30) not null,
- nextid int not null,
- constraint pk_sequence primary key (name)
+name varchar(30) not null,
+nextid int not null,
+constraint pk_sequence primary key (name)
);
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Author.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Author.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Author.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Author.java Sat Oct 10 05:45:06 2009
@@ -52,7 +52,7 @@
this.favouriteSection = favouriteSection;
}
- public int getId() {
+ public int getId() {
return id;
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Post.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Post.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Post.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/Post.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package domain.blog;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
public class Post {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/blog/mappers/BlogMapper.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.session.RowBounds;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
public interface BlogMapper {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/jpetstore/Order.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/jpetstore/Order.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/jpetstore/Order.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/jpetstore/Order.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,10 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
public class Order implements Serializable {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/misc/RichType.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/misc/RichType.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/misc/RichType.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/domain/misc/RichType.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,9 @@
package domain.misc;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class RichType {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java Sat Oct 10 05:45:06 2009
@@ -7,8 +7,10 @@
import org.junit.Test;
import javax.sql.DataSource;
-import java.io.*;
-import java.sql.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.Connection;
+import java.sql.SQLException;
import java.util.Properties;
public class BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,17 @@
package org.apache.ibatis.binding;
import domain.blog.*;
-import org.apache.ibatis.session.*;
import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import static org.junit.Assert.*;
-import org.junit.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class BindingTest {
private static SqlSessionFactory sqlSessionFactory;
@@ -39,12 +44,12 @@
SqlSession session = sqlSessionFactory.openSession();
try {
BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class);
- List<Post> posts = mapper.findPostsInList(new ArrayList<Integer>(){{
+ List<Post> posts = mapper.findPostsInList(new ArrayList<Integer>() {{
add(1);
add(3);
add(5);
}});
- assertEquals(3,posts.size());
+ assertEquals(3, posts.size());
session.rollback();
} finally {
session.close();
@@ -56,9 +61,9 @@
SqlSession session = sqlSessionFactory.openSession();
try {
BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class);
- Integer[] params = new Integer[] {1,3,5};
+ Integer[] params = new Integer[]{1, 3, 5};
List<Post> posts = mapper.findPostsInArray(params);
- assertEquals(3,posts.size());
+ assertEquals(3, posts.size());
session.rollback();
} finally {
session.close();
@@ -70,9 +75,9 @@
SqlSession session = sqlSessionFactory.openSession();
try {
BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class);
- List<Post> posts = mapper.findThreeSpecificPosts(1,new RowBounds(1,1),3,5);
- assertEquals(1,posts.size());
- assertEquals(3,posts.get(0).getId());
+ List<Post> posts = mapper.findThreeSpecificPosts(1, new RowBounds(1, 1), 3, 5);
+ assertEquals(1, posts.size());
+ assertEquals(3, posts.get(0).getId());
session.rollback();
} finally {
session.close();
@@ -84,9 +89,9 @@
SqlSession session = sqlSessionFactory.openSession();
try {
BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class);
- Author author = new Author(-1,"cbegin","******","cbegin@nowhere.com","N/A",Section.NEWS);
+ Author author = new Author(-1, "cbegin", "******", "cbegin@nowhere.com", "N/A", Section.NEWS);
int rows = mapper.insertAuthor(author);
- assertEquals(1,rows);
+ assertEquals(1, rows);
session.rollback();
} finally {
session.close();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java Sat Oct 10 05:45:06 2009
@@ -1,13 +1,15 @@
package org.apache.ibatis.binding;
-import domain.blog.*;
+import domain.blog.Author;
+import domain.blog.Post;
+import domain.blog.Section;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.session.RowBounds;
import java.util.List;
public interface BoundAuthorMapper {
-
+
//======================================================
List<Post> findPostsInArray(Integer[] ids);
@@ -23,14 +25,14 @@
//======================================================
@ConstructorArgs({
- @Arg(column = "AUTHOR_ID", javaType = Integer.class)
- })
+ @Arg(column = "AUTHOR_ID", javaType = Integer.class)
+ })
@Results({
- @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 = "username", column = "AUTHOR_USERNAME"),
+ @Result(property = "password", column = "AUTHOR_PASSWORD"),
+ @Result(property = "email", column = "AUTHOR_EMAIL"),
+ @Result(property = "bio", column = "AUTHOR_BIO")
+ })
@Select({
"SELECT ",
" ID as AUTHOR_ID,",
@@ -44,13 +46,13 @@
//======================================================
@ConstructorArgs({
- @Arg(column = "AUTHOR_ID", javaType = Integer.class),
- @Arg(column = "AUTHOR_USERNAME", javaType = String.class),
- @Arg(column = "AUTHOR_PASSWORD", javaType = String.class),
- @Arg(column = "AUTHOR_EMAIL", javaType = String.class),
- @Arg(column = "AUTHOR_BIO", javaType = String.class),
- @Arg(column = "AUTHOR_SECTION", javaType = Section.class)
- })
+ @Arg(column = "AUTHOR_ID", javaType = Integer.class),
+ @Arg(column = "AUTHOR_USERNAME", javaType = String.class),
+ @Arg(column = "AUTHOR_PASSWORD", javaType = String.class),
+ @Arg(column = "AUTHOR_EMAIL", javaType = String.class),
+ @Arg(column = "AUTHOR_BIO", javaType = String.class),
+ @Arg(column = "AUTHOR_SECTION", javaType = Section.class)
+ })
@Select({
"SELECT ",
" ID as AUTHOR_ID,",
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml Sat Oct 10 05:45:06 2009
@@ -12,7 +12,7 @@
</selectKey>
insert into Author (id,username,password,email,bio,favourite_section)
values(
- #{id}, #{username}, #{password}, #{email}, #{bio}, #{favouriteSection:VARCHAR}
+ #{id}, #{username}, #{password}, #{email}, #{bio}, #{favouriteSection:VARCHAR}
)
</insert>
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java Sat Oct 10 05:45:06 2009
@@ -1,9 +1,12 @@
package org.apache.ibatis.binding;
-import domain.blog.*;
+import domain.blog.Blog;
+import domain.blog.DraftPost;
+import domain.blog.Post;
import org.apache.ibatis.annotations.*;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
@CacheNamespace
public interface BoundBlogMapper {
@@ -21,7 +24,7 @@
@Select({
"SELECT *",
"FROM blog"
- })
+ })
List<Blog> selectBlogs();
//======================================================
@@ -33,7 +36,7 @@
@Select({
"SELECT *",
"FROM blog"
- })
+ })
List<Map> selectBlogsAsMaps();
//======================================================
@@ -55,8 +58,8 @@
@Select("SELECT * FROM post ORDER BY id")
@Results({
- @Result(id = true, property = "id", column = "id")
- })
+ @Result(id = true, property = "id", column = "id")
+ })
@TypeDiscriminator(
column = "draft",
javaType = int.class,
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java Sat Oct 10 05:45:06 2009
@@ -1,17 +1,18 @@
package org.apache.ibatis.binding;
+import domain.blog.Author;
+import domain.blog.Blog;
+import domain.blog.Post;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Environment;
+import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
import javax.sql.DataSource;
-import domain.blog.*;
-
public class IbatisConfig {
public SqlSessionFactory getSqlSessionFactory() {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/AuthorMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/AuthorMapper.xml?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/AuthorMapper.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/AuthorMapper.xml Sat Oct 10 05:45:06 2009
@@ -78,12 +78,12 @@
<update id="updateAuthorIfNecessary"
parameterType="domain.blog.Author">
update Author
- <set>
- <if test="username != null">username=#{username},</if>
- <if test="password != null">password=#{password},</if>
- <if test="email != null">email=#{email},</if>
- <if test="bio != null">bio=#{bio}</if>
- </set>
+ <set>
+ <if test="username != null">username=#{username},</if>
+ <if test="password != null">password=#{password},</if>
+ <if test="email != null">email=#{email},</if>
+ <if test="bio != null">bio=#{bio}</if>
+ </set>
where id=#{id}
</update>
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java Sat Oct 10 05:45:06 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
-import java.util.*;
+import java.util.List;
+import java.util.Properties;
public class ExampleObjectFactory extends DefaultObjectFactory {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.builder;
-import org.apache.ibatis.plugin.*;
+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 java.util.Properties;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java Sat Oct 10 05:45:06 2009
@@ -1,8 +1,12 @@
package org.apache.ibatis.builder;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class ExampleTypeHandler implements TypeHandler {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/NestedBlogMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/NestedBlogMapper.xml?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/NestedBlogMapper.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/NestedBlogMapper.xml Sat Oct 10 05:45:06 2009
@@ -21,10 +21,10 @@
<id property="id" column="post_id"/>
<result property="subject" column="post_subject"/>
<association property="author" column="post_author_id" javaType="domain.blog.Author"/>
- <collection property="comments" column="post_id" ofType="domain.blog.Comment" >
+ <collection property="comments" column="post_id" ofType="domain.blog.Comment">
<id property="id" column="comment_id"/>
</collection>
- <collection property="tags" column="post_id" ofType="domain.blog.Tag" >
+ <collection property="tags" column="post_id" ofType="domain.blog.Tag">
<id property="id" column="tag_id"/>
</collection>
<discriminator javaType="int" column="draft">
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/PostMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/PostMapper.xml?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/PostMapper.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/PostMapper.xml Sat Oct 10 05:45:06 2009
@@ -20,7 +20,8 @@
<otherwise>
<if test="ids != null">
AND id IN
- <foreach item="item_id" index="index" open="(" close=")" separator="," collection="ids">#{ids[${index}]}</foreach>
+ <foreach item="item_id" index="index" open="(" close=")" separator="," collection="ids">#{ids[${index}]}
+ </foreach>
</if>
<trim prefix="AND">
<include refid="byBlogId"/>
@@ -28,15 +29,15 @@
</otherwise>
</choose>
</where>
- </select>
+ </select>
<select id="selectPostIn" resultType="domain.blog.Post">
SELECT *
FROM POST P
WHERE ID in
<foreach item="item" index="index" collection="list"
- open="(" separator="," close=")">
- #{item}
+ open="(" separator="," close=")">
+ #{item}
</foreach>
</select>
@@ -45,10 +46,10 @@
FROM POST P
WHERE ID in
<foreach item="item" index="index" collection="list"
- open="(" separator="," close=")">
- <if test="index / 2 != 0">
- #{item}
- </if>
+ open="(" separator="," close=")">
+ <if test="index / 2 != 0">
+ #{item}
+ </if>
</foreach>
</select>
</mapper>
\ No newline at end of file
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,10 @@
package org.apache.ibatis.builder;
-import static org.junit.Assert.*;
-import org.junit.Test;
import org.apache.ibatis.builder.xml.XMLConfigBuilder;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.Configuration;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
import java.io.Reader;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java Sat Oct 10 05:45:06 2009
@@ -2,14 +2,19 @@
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.session.*;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import java.io.*;
+import java.io.IOException;
+import java.io.Reader;
import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
public class DynamicSqlSourceTest extends BaseDataTest {
@@ -58,13 +63,13 @@
public void shouldConditionallyDefault() throws Exception {
final String expected = "SELECT * FROM BLOG WHERE CATEGORY = 'DEFAULT'";
DynamicSqlSource source = createDynamicSqlSource(
- new TextSqlNode("SELECT * FROM BLOG"),
+ new TextSqlNode("SELECT * FROM BLOG"),
new ChooseSqlNode(new ArrayList() {{
add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = ?")), "false"
));
add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "false"
));
- }},mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
+ }}, mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
}
@@ -79,7 +84,7 @@
));
add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "false"
));
- }},mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
+ }}, mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
}
@@ -94,7 +99,7 @@
));
add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "true"
));
- }},mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
+ }}, mixedContents(new TextSqlNode("WHERE CATEGORY = 'DEFAULT'"))));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
}
@@ -105,10 +110,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("SELECT * FROM BLOG"),
new WhereSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "true"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode(" or NAME = ? ")), "false"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "true"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode(" or NAME = ? ")), "false"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -120,10 +125,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("SELECT * FROM BLOG"),
new WhereSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "false"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode(" or NAME = ? ")), "true"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "false"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode(" or NAME = ? ")), "true"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -135,10 +140,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("SELECT * FROM BLOG"),
new WhereSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "true"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode("OR NAME = ? ")), "true"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "true"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode("OR NAME = ? ")), "true"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -150,10 +155,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("SELECT * FROM BLOG"),
new WhereSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "false"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode("OR NAME = ? ")), "false"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" and ID = ? ")), "false"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode("OR NAME = ? ")), "false"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -165,10 +170,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("UPDATE BLOG"),
new SetSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" ID = ?, ")), "true"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode(" NAME = ?, ")), "true"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" ID = ?, ")), "true"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode(" NAME = ?, ")), "true"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -180,10 +185,10 @@
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("UPDATE BLOG"),
new SetSqlNode(mixedContents(
- new IfSqlNode(mixedContents(new TextSqlNode(" , ID = ? ")), "false"
- ),
- new IfSqlNode(mixedContents(new TextSqlNode(", NAME = ? ")), "false"
- )
+ new IfSqlNode(mixedContents(new TextSqlNode(" , ID = ? ")), "false"
+ ),
+ new IfSqlNode(mixedContents(new TextSqlNode(", NAME = ? ")), "false"
+ )
)));
BoundSql boundSql = source.getBoundSql(null);
assertEquals(expected, boundSql.getSql());
@@ -191,19 +196,19 @@
@Test
public void shouldIterateOnceForEachItemInCollection() throws Exception {
- final HashMap<String,String[]> parameterObject = new HashMap() {{
- put("array", new String[]{"one", "two", "three"});
- }};
+ final HashMap<String, String[]> parameterObject = new HashMap() {{
+ put("array", new String[]{"one", "two", "three"});
+ }};
final String expected = "SELECT * FROM BLOG WHERE ID in ( one = ? AND two = ? AND three = ? )";
DynamicSqlSource source = createDynamicSqlSource(
new TextSqlNode("SELECT * FROM BLOG WHERE ID in"),
- new ForEachSqlNode(mixedContents(new TextSqlNode("${item} = #{item}")),"array","index","item","(",")","AND"));
+ new ForEachSqlNode(mixedContents(new TextSqlNode("${item} = #{item}")), "array", "index", "item", "(", ")", "AND"));
BoundSql boundSql = source.getBoundSql(parameterObject);
assertEquals(expected, boundSql.getSql());
assertEquals(3, boundSql.getParameterMappings().size());
assertEquals("__frch_item_0", boundSql.getParameterMappings().get(0).getProperty());
assertEquals("__frch_item_1", boundSql.getParameterMappings().get(1).getProperty());
- assertEquals("__frch_item_2", boundSql.getParameterMappings().get(2).getProperty());
+ assertEquals("__frch_item_2", boundSql.getParameterMappings().get(2).getProperty());
}
private DynamicSqlSource createDynamicSqlSource(SqlNode... contents) throws IOException, SQLException {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.builder.xml.dynamic;
-import domain.blog.*;
+import domain.blog.Author;
+import domain.blog.Section;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
@@ -12,49 +13,49 @@
@Test
public void shouldCompareStringsReturnTrue() {
- boolean value = evaluator.evaluateBoolean("username == 'cbegin'", new Author(1,"cbegin","******","cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("username == 'cbegin'", new Author(1, "cbegin", "******", "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(true, value);
}
@Test
public void shouldCompareStringsReturnFalse() {
- boolean value = evaluator.evaluateBoolean("username == 'norm'", new Author(1,"cbegin","******","cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("username == 'norm'", new Author(1, "cbegin", "******", "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(false, value);
}
@Test
public void shouldReturnTrueIfNotNull() {
- boolean value = evaluator.evaluateBoolean("username", new Author(1,"cbegin","******","cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("username", new Author(1, "cbegin", "******", "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(true, value);
}
@Test
public void shouldReturnFalseIfNull() {
- boolean value = evaluator.evaluateBoolean("password", new Author(1,"cbegin",null,"cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("password", new Author(1, "cbegin", null, "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(false, value);
}
@Test
public void shouldReturnTrueIfNotZero() {
- boolean value = evaluator.evaluateBoolean("id", new Author(1,"cbegin",null,"cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("id", new Author(1, "cbegin", null, "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(true, value);
}
@Test
public void shouldReturnFalseIfZero() {
- boolean value = evaluator.evaluateBoolean("id", new Author(0,"cbegin",null,"cbegin@apache.org","N/A", Section.NEWS));
+ boolean value = evaluator.evaluateBoolean("id", new Author(0, "cbegin", null, "cbegin@apache.org", "N/A", Section.NEWS));
assertEquals(false, value);
}
@Test
public void shouldIterateOverIterable() {
- final HashMap<String,String[]> parameterObject = new HashMap() {{
- put("array", new String[]{"1", "2", "3"});
- }};
+ final HashMap<String, String[]> parameterObject = new HashMap() {{
+ put("array", new String[]{"1", "2", "3"});
+ }};
final Iterable iterable = evaluator.evaluateIterable("array", parameterObject);
int i = 0;
- for(Object o: iterable) {
- assertEquals(String.valueOf(++i),o);
+ for (Object o : iterable) {
+ assertEquals(String.valueOf(++i), o);
}
}
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java Sat Oct 10 05:45:06 2009
@@ -1,11 +1,16 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.LoggingCache;
+import org.apache.ibatis.cache.decorators.ScheduledCache;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.decorators.SynchronizedCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
public class BaseCacheTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.decorators.SynchronizedCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import static org.junit.Assert.*;
import org.junit.Test;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.LoggingCache;
+import org.apache.ibatis.cache.decorators.ScheduledCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import static org.junit.Assert.*;
import org.junit.Test;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.decorators.SoftCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import static org.junit.Assert.*;
import org.junit.Test;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java Sat Oct 10 05:45:06 2009
@@ -1,13 +1,16 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.decorators.WeakCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import static org.junit.Assert.*;
-import org.junit.*;
+import org.junit.Ignore;
+import org.junit.Test;
public class WeakCacheTest {
- @Test @Ignore
+ @Test
+ @Ignore
public void shouldDemonstrateObjectsBeingCollectedAsNeeded() {
final int N = 300000;
WeakCache cache = new WeakCache(new PerpetualCache("default"));
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java Sat Oct 10 05:45:06 2009
@@ -4,12 +4,18 @@
import org.apache.ibatis.datasource.DataSourceException;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import static org.junit.Assert.assertEquals;
-import org.junit.*;
+import org.junit.Before;
+import org.junit.Test;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
import javax.sql.DataSource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
public class JndiDataSourceFactoryTest extends BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java Sat Oct 10 05:45:06 2009
@@ -14,7 +14,8 @@
import org.apache.ibatis.session.SessionException;
import org.apache.ibatis.transaction.TransactionException;
import org.apache.ibatis.type.TypeException;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import java.lang.reflect.InvocationTargetException;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java Sat Oct 10 05:45:06 2009
@@ -1,11 +1,14 @@
package org.apache.ibatis.executor;
-import domain.blog.*;
+import domain.blog.Author;
+import domain.blog.Blog;
+import domain.blog.Post;
+import domain.blog.Section;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.logging.jdbc.ConnectionLogger;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
import static org.junit.Assert.*;
@@ -13,7 +16,9 @@
import javax.sql.DataSource;
import java.sql.Connection;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class BaseExecutorTest extends BaseDataTest {
private final Configuration config;
@@ -27,7 +32,7 @@
config.setDefaultStatementTimeout(5000);
}
- @Test
+ @Test
public void shouldInsertNewAuthorWithBeforeAutoKey() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
@@ -314,7 +319,7 @@
public void shouldFetchPostsForBlog() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- connection = ConnectionLogger.newInstance(connection);
+ connection = ConnectionLogger.newInstance(connection);
try {
Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java Sat Oct 10 05:45:06 2009
@@ -5,13 +5,17 @@
import org.apache.ibatis.builder.xml.dynamic.DynamicSqlSource;
import org.apache.ibatis.builder.xml.dynamic.TextSqlNode;
import org.apache.ibatis.cache.Cache;
-import org.apache.ibatis.cache.decorators.*;
+import org.apache.ibatis.cache.decorators.LoggingCache;
+import org.apache.ibatis.cache.decorators.ScheduledCache;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.decorators.SynchronizedCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.type.*;
import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.util.*;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.executor;
-import domain.blog.*;
-import org.apache.ibatis.executor.loader.*;
+import domain.blog.Author;
+import domain.blog.Section;
+import org.apache.ibatis.executor.loader.ResultLoaderRegistry;
+import org.apache.ibatis.executor.loader.ResultObjectProxy;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java Sat Oct 10 05:45:06 2009
@@ -1,10 +1,10 @@
package org.apache.ibatis.io;
-import org.junit.Test;
-import org.junit.Before;
+import org.apache.ibatis.BaseDataTest;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import org.apache.ibatis.BaseDataTest;
+import org.junit.Before;
+import org.junit.Test;
public class ClassLoaderWrapperTest extends BaseDataTest {
@@ -55,12 +55,12 @@
public void getResourceAsStream() {
assertNotNull(wrapper.getResourceAsStream(JPETSTORE_PROPERTIES));
}
-
+
@Test
public void getResourceAsStreamNotFound() {
assertNull(wrapper.getResourceAsStream(RESOURCE_NOT_FOUND));
}
-
+
@Test
public void getResourceAsStreamWithClassLoader() {
assertNotNull(wrapper.getResourceAsStream(JPETSTORE_PROPERTIES, loader));
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java Sat Oct 10 05:45:06 2009
@@ -69,13 +69,13 @@
@Test
public void shouldGetResourceAsFile() throws Exception {
File file = Resources.getResourceAsFile(JPETSTORE_PROPERTIES);
- assertTrue(file.getAbsolutePath().replace('\\','/').endsWith("jpetstore/jpetstore-hsqldb.properties"));
+ assertTrue(file.getAbsolutePath().replace('\\', '/').endsWith("jpetstore/jpetstore-hsqldb.properties"));
}
@Test
public void shouldGetResourceAsFileWithClassloader() throws Exception {
File file = Resources.getResourceAsFile(CLASS_LOADER, JPETSTORE_PROPERTIES);
- assertTrue(file.getAbsolutePath().replace('\\','/').endsWith("jpetstore/jpetstore-hsqldb.properties"));
+ assertTrue(file.getAbsolutePath().replace('\\', '/').endsWith("jpetstore/jpetstore-hsqldb.properties"));
}
@Test
@@ -130,7 +130,7 @@
// clean up
Resources.setCharset(charset);
-}
+ }
@Test
public void shouldGetReaderWithClassLoader() throws IOException {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java Sat Oct 10 05:45:06 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.jdbc;
-import org.apache.ibatis.type.*;
-import static org.junit.Assert.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.StringTypeHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
public class NullTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java Sat Oct 10 05:45:06 2009
@@ -2,11 +2,14 @@
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import java.sql.Connection;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
public class PooledDataSourceTest extends BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptMissingEOLTerminator.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptMissingEOLTerminator.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptMissingEOLTerminator.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptMissingEOLTerminator.sql Sat Oct 10 05:45:06 2009
@@ -1,12 +1,12 @@
drop table product;
create table product (
- productid varchar(10) not null,
- category varchar(10) not null,
- name varchar(80) null,
- descn varchar(255) null,
- constraint pk_product primary key (productid),
- constraint fk_product_1 foreign key (category)
- references category (catid)
+productid varchar(10) not null,
+category varchar(10) not null,
+name varchar(80) null,
+descn varchar(255) null,
+constraint pk_product primary key (productid),
+constraint fk_product_1 foreign key (category)
+references category (catid)
)
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java Sat Oct 10 05:45:06 2009
@@ -8,9 +8,13 @@
import org.junit.Test;
import javax.sql.DataSource;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
public class ScriptRunnerTest extends BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java Sat Oct 10 05:45:06 2009
@@ -1,12 +1,14 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import javax.sql.DataSource;
import java.sql.Connection;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
public class SqlRunnerTest extends BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java Sat Oct 10 05:45:06 2009
@@ -2,10 +2,12 @@
import org.apache.ibatis.BaseDataTest;
import static org.junit.Assert.*;
-import org.junit.*;
+import org.junit.Before;
+import org.junit.Test;
import javax.sql.DataSource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.Types;
public class MetadataTest extends BaseDataTest {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Sat Oct 10 05:45:06 2009
@@ -3,12 +3,18 @@
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.SqlRunner;
-import org.junit.*;
+import org.junit.AfterClass;
import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
import javax.sql.DataSource;
-import java.io.*;
-import java.net.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.sql.Connection;
public class MigratorTest extends BaseDataTest {
@@ -96,7 +102,7 @@
assertTrue(buffer.toString().contains("--help"));
buffer.clear();
- Migrator.main(args("--path=" + f.getAbsolutePath(), "script","20080827200212","20080827200214"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "script", "20080827200212", "20080827200214"));
assertFalse(buffer.toString().contains("20080827200210"));
assertFalse(buffer.toString().contains("20080827200211"));
assertTrue(buffer.toString().contains("20080827200212"));
@@ -106,7 +112,7 @@
assertFalse(buffer.toString().contains("-- @UNDO"));
buffer.clear();
- Migrator.main(args("--path=" + f.getAbsolutePath(), "script","20080827200215", "20080827200213"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "script", "20080827200215", "20080827200213"));
assertFalse(buffer.toString().contains("20080827200210"));
assertFalse(buffer.toString().contains("20080827200211"));
assertFalse(buffer.toString().contains("20080827200212"));
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200210_create_changelog.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200210_create_changelog.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200210_create_changelog.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200210_create_changelog.sql Sat Oct 10 05:45:06 2009
@@ -10,14 +10,14 @@
-- BigInteger and String compatible fields respectively.
CREATE TABLE ${changelog} (
- ID NUMERIC(20,0) NOT NULL,
- APPLIED_AT VARCHAR(25) NOT NULL,
- DESCRIPTION VARCHAR(255) NOT NULL
+ID NUMERIC(20,0) NOT NULL,
+APPLIED_AT VARCHAR(25) NOT NULL,
+DESCRIPTION VARCHAR(255) NOT NULL
);
ALTER TABLE ${changelog}
- ADD CONSTRAINT PK_${changelog}
- PRIMARY KEY (id);
+ADD CONSTRAINT PK_${changelog}
+PRIMARY KEY (id);
--//@UNDO
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200211_create_author.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200211_create_author.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200211_create_author.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200211_create_author.sql Sat Oct 10 05:45:06 2009
@@ -2,13 +2,13 @@
-- Migration SQL that makes the change goes here.
CREATE TABLE author (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
- username VARCHAR(255) NOT NULL,
- password VARCHAR(255) NOT NULL,
- email VARCHAR(255) NOT NULL,
- bio LONG VARCHAR,
- favourite_section VARCHAR(25),
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+username VARCHAR(255) NOT NULL,
+password VARCHAR(255) NOT NULL,
+email VARCHAR(255) NOT NULL,
+bio LONG VARCHAR,
+favourite_section VARCHAR(25),
+PRIMARY KEY (id)
);
--//@UNDO
@@ -26,42 +26,42 @@
DROP PROCEDURE selectAuthorViaOutParams;
CREATE TABLE blog (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- author_id INT NOT NULL,
- title VARCHAR(255),
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+author_id INT NOT NULL,
+title VARCHAR(255),
+PRIMARY KEY (id)
);
CREATE TABLE post (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- blog_id INT,
- author_id INT NOT NULL,
- created_on TIMESTAMP NOT NULL,
- section VARCHAR(25) NOT NULL,
- subject VARCHAR(255) NOT NULL,
- body CLOB NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (blog_id) REFERENCES blog(id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+blog_id INT,
+author_id INT NOT NULL,
+created_on TIMESTAMP NOT NULL,
+section VARCHAR(25) NOT NULL,
+subject VARCHAR(255) NOT NULL,
+body CLOB NOT NULL,
+PRIMARY KEY (id),
+FOREIGN KEY (blog_id) REFERENCES blog(id)
);
CREATE TABLE tag (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- name VARCHAR(255) NOT NULL,
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+name VARCHAR(255) NOT NULL,
+PRIMARY KEY (id)
);
CREATE TABLE post_tag (
- post_id INT NOT NULL,
- tag_id INT NOT NULL,
- PRIMARY KEY (post_id, tag_id)
+post_id INT NOT NULL,
+tag_id INT NOT NULL,
+PRIMARY KEY (post_id, tag_id)
);
CREATE TABLE comment (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- post_id INT NOT NULL,
- name LONG VARCHAR NOT NULL,
- comment LONG VARCHAR NOT NULL,
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+post_id INT NOT NULL,
+name LONG VARCHAR NOT NULL,
+comment LONG VARCHAR NOT NULL,
+PRIMARY KEY (id)
);
CREATE PROCEDURE selectTwoSetsOfAuthors(DP1 INTEGER, DP2 INTEGER)
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200212_create_blog.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200212_create_blog.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200212_create_blog.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200212_create_blog.sql Sat Oct 10 05:45:06 2009
@@ -2,10 +2,10 @@
-- Migration SQL that makes the change goes here.
CREATE TABLE blog (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- author_id INT NOT NULL,
- title VARCHAR(255),
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+author_id INT NOT NULL,
+title VARCHAR(255),
+PRIMARY KEY (id)
);
--//@UNDO
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200213_create_tags_posts.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200213_create_tags_posts.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200213_create_tags_posts.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200213_create_tags_posts.sql Sat Oct 10 05:45:06 2009
@@ -2,27 +2,27 @@
-- Migration SQL that makes the change goes here.
CREATE TABLE post (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- blog_id INT,
- author_id INT NOT NULL,
- created_on TIMESTAMP NOT NULL,
- section VARCHAR(25) NOT NULL,
- subject VARCHAR(255) NOT NULL,
- body CLOB NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (blog_id) REFERENCES blog(id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+blog_id INT,
+author_id INT NOT NULL,
+created_on TIMESTAMP NOT NULL,
+section VARCHAR(25) NOT NULL,
+subject VARCHAR(255) NOT NULL,
+body CLOB NOT NULL,
+PRIMARY KEY (id),
+FOREIGN KEY (blog_id) REFERENCES blog(id)
);
CREATE TABLE tag (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- name VARCHAR(255) NOT NULL,
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+name VARCHAR(255) NOT NULL,
+PRIMARY KEY (id)
);
CREATE TABLE post_tag (
- post_id INT NOT NULL,
- tag_id INT NOT NULL,
- PRIMARY KEY (post_id, tag_id)
+post_id INT NOT NULL,
+tag_id INT NOT NULL,
+PRIMARY KEY (post_id, tag_id)
);
--//@UNDO
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200214_create_comments.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200214_create_comments.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200214_create_comments.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/20080827200214_create_comments.sql Sat Oct 10 05:45:06 2009
@@ -2,11 +2,11 @@
-- Migration SQL that makes the change goes here.
CREATE TABLE comment (
- id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- post_id INT NOT NULL,
- name LONG VARCHAR NOT NULL,
- comment LONG VARCHAR NOT NULL,
- PRIMARY KEY (id)
+id INT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+post_id INT NOT NULL,
+name LONG VARCHAR NOT NULL,
+comment LONG VARCHAR NOT NULL,
+PRIMARY KEY (id)
);
--//@UNDO
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/bootstrap.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/bootstrap.sql?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/bootstrap.sql (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/example/scripts/bootstrap.sql Sat Oct 10 05:45:06 2009
@@ -35,6 +35,6 @@
-- database change management.
create table BOOTSTRAP (
- ID NUMERIC(8,0),
- PRIMARY KEY(ID)
+ID NUMERIC(8,0),
+PRIMARY KEY(ID)
)
\ No newline at end of file
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java Sat Oct 10 05:45:06 2009
@@ -32,7 +32,8 @@
import junit.framework.TestSuite;
-import java.math.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
public class ArithmeticAndLogicalOperatorsTest extends OgnlTestCase {
private static Object[][] TESTS = {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java Sat Oct 10 05:45:06 2009
@@ -31,7 +31,8 @@
package org.apache.ibatis.ognl;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.objects.*;
+import org.apache.ibatis.ognl.objects.Root;
+import org.apache.ibatis.ognl.objects.Simple;
public class ArrayCreationTest extends OgnlTestCase {
private static Root ROOT = new Root();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayElementsTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayElementsTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayElementsTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayElementsTest.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,8 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Root;
-import java.lang.reflect.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.Member;
import java.util.Map;
public class ArrayElementsTest extends OgnlTestCase {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/LambdaExpressionTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/LambdaExpressionTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/LambdaExpressionTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/LambdaExpressionTest.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,8 @@
import junit.framework.TestSuite;
import java.math.BigInteger;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
public class LambdaExpressionTest extends OgnlTestCase {
private static Object[][] TESTS = {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MapCreationTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MapCreationTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MapCreationTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MapCreationTest.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,10 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Root;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
public class MapCreationTest extends OgnlTestCase {
private static Root ROOT = new Root();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MemberAccessTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MemberAccessTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MemberAccessTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/MemberAccessTest.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,8 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Simple;
-import java.lang.reflect.*;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
import java.util.Map;
public class MemberAccessTest extends OgnlTestCase {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumberFormatExceptionTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumberFormatExceptionTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumberFormatExceptionTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumberFormatExceptionTest.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,8 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Simple;
-import java.math.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
public class NumberFormatExceptionTest extends OgnlTestCase {
private static Simple SIMPLE = new Simple();
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumericConversionTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumericConversionTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumericConversionTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/NumericConversionTest.java Sat Oct 10 05:45:06 2009
@@ -32,7 +32,8 @@
import junit.framework.TestSuite;
-import java.math.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
public class NumericConversionTest extends OgnlTestCase {
private static Object[][] TESTS = {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ObjectIndexedTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ObjectIndexedTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ObjectIndexedTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ObjectIndexedTest.java Sat Oct 10 05:45:06 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.ognl;
-import junit.framework.*;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class ObjectIndexedTest extends TestCase {
protected OgnlContext context;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/OgnlTestCase.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/OgnlTestCase.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/OgnlTestCase.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/OgnlTestCase.java Sat Oct 10 05:45:06 2009
@@ -30,9 +30,11 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl;
-import junit.framework.*;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.lang.reflect.Array;
public class OgnlTestCase extends TestCase {
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/Performance.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/Performance.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/Performance.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/Performance.java Sat Oct 10 05:45:06 2009
@@ -33,7 +33,8 @@
import org.apache.ibatis.ognl.objects.Bean1;
import java.lang.reflect.Method;
-import java.text.*;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
public class Performance extends Object {
private static int MAX_ITERATIONS = -1;
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/PrivateMemberTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/PrivateMemberTest.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/PrivateMemberTest.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/PrivateMemberTest.java Sat Oct 10 05:45:06 2009
@@ -30,7 +30,8 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl;
-import junit.framework.*;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
* This is a test program for private access in OGNL.
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java?rev=823796&r1=823795&r2=823796&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java Sat Oct 10 05:45:06 2009
@@ -30,7 +30,8 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class BaseObjectIndexed extends Object {
private Map attributes = new HashMap();