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/01/23 07:32:46 UTC
svn commit: r736963 [16/21] - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-compat/src/main/java/com/ibatis/common/resources/
ibatis-3-compat/src/main/java/com/ibatis/common/util/
ibatis-3-compat/src/mai...
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimeTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimeTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimeTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimeTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class SqlTimeTypeHandler extends BaseTypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimestampTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimestampTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimestampTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlTimestampTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class SqlTimestampTypeHandler extends BaseTypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class StringTypeHandler extends BaseTypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Date;
public class TimeOnlyTypeHandler extends BaseTypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java Thu Jan 22 22:32:36 2009
@@ -19,5 +19,5 @@
public TypeException(Throwable cause) {
super(cause);
}
-
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public interface TypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.type;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
public class TypeHandlerRegistry {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/UnknownTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.type;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class UnknownTypeHandler extends BaseTypeHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/GenericTokenParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/GenericTokenParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/GenericTokenParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/GenericTokenParser.java Thu Jan 22 22:32:36 2009
@@ -19,7 +19,7 @@
public String parse(String text) {
StringBuilder builder = new StringBuilder();
if (text != null) {
- String after=text;
+ String after = text;
int start = after.indexOf(openToken);
int end = after.indexOf(closeToken);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/Nodelet.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/Nodelet.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/Nodelet.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/Nodelet.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.xml;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletContext.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletContext.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletContext.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletContext.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,13 @@
package org.apache.ibatis.xml;
-import org.w3c.dom.*;
-
-import java.util.*;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
public class NodeletContext {
@@ -176,8 +181,8 @@
List<NodeletContext> children = new ArrayList<NodeletContext>();
NodeList nodeList = node.getChildNodes();
if (nodeList != null) {
- for (int i=0,n=nodeList.getLength(); i < n; i++) {
- children.add(new NodeletContext(nodeList.item(i),variables));
+ for (int i = 0, n = nodeList.getLength(); i < n; i++) {
+ children.add(new NodeletContext(nodeList.item(i), variables));
}
}
return children;
@@ -185,7 +190,7 @@
public Properties getChildrenAsProperties() {
Properties properties = new Properties();
- for(NodeletContext child : getChildren()) {
+ for (NodeletContext child : getChildren()) {
String name = child.getStringAttribute("name");
String value = child.getStringAttribute("value");
if (name != null && value != null) {
@@ -201,7 +206,7 @@
if (attributeNodes != null) {
for (int i = 0; i < attributeNodes.getLength(); i++) {
Node attribute = attributeNodes.item(i);
- String value = PropertyParser.parse(attribute.getNodeValue(),variables);
+ String value = PropertyParser.parse(attribute.getNodeValue(), variables);
attributes.put(attribute.getNodeName(), value);
}
}
@@ -225,7 +230,7 @@
if (child.getNodeType() == Node.CDATA_SECTION_NODE
|| child.getNodeType() == Node.TEXT_NODE) {
String data = ((CharacterData) child).getData();
- data = PropertyParser.parse(data,variables);
+ data = PropertyParser.parse(data, variables);
return data;
}
return null;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/NodeletParser.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,17 @@
package org.apache.ibatis.xml;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.xml.sax.*;
-import javax.xml.parsers.*;
-import java.io.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.Reader;
import java.lang.reflect.Method;
import java.util.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Post.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package domain.blog;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
public class Post {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/jpetstore/Order.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/jpetstore/Order.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/jpetstore/Order.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/jpetstore/Order.java Thu Jan 22 22:32:36 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/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/RichType.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/RichType.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/RichType.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/RichType.java Thu Jan 22 22:32:36 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/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/generics/GenericConcrete.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/generics/GenericConcrete.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/generics/GenericConcrete.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/generics/GenericConcrete.java Thu Jan 22 22:32:36 2009
@@ -16,6 +16,6 @@
}
public void setId(Integer id) {
- this.id = (long)id;
+ this.id = (long) id;
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java Thu Jan 22 22:32:36 2009
@@ -1,14 +1,16 @@
package org.apache.ibatis;
+import org.apache.ibatis.datasource.pooled.PooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.ScriptRunner;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
-import org.apache.ibatis.datasource.pooled.PooledDataSource;
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/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java Thu Jan 22 22:32:36 2009
@@ -1,17 +1,16 @@
package org.apache.ibatis.api;
-import org.junit.*;
+import domain.blog.*;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.mapping.Configuration;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
import java.io.Reader;
import java.util.List;
-import domain.blog.*;
-
-import static org.junit.Assert.*;
-
public class SqlSessionTest extends BaseDataTest {
private static SqlSessionFactory sqlMapper;
@@ -28,7 +27,7 @@
SqlSession session = sqlMapper.openSession();
try {
List<Author> authors = session.selectList("com.domain.AuthorMapper.selectAllAuthors");
- assertEquals(2,authors.size());
+ assertEquals(2, authors.size());
} finally {
session.close();
}
@@ -51,7 +50,7 @@
public void shouldSelectOneAuthorAsList() throws Exception {
SqlSession session = sqlMapper.openSession();
try {
- List<Author> authors= session.selectList(
+ List<Author> authors = session.selectList(
"com.domain.AuthorMapper.selectAuthor", new Author(101));
assertEquals(101, authors.get(0).getId());
assertEquals(Section.NEWS, authors.get(0).getFavouriteSection());
@@ -159,15 +158,15 @@
final int id = 102;
List<Author> authors = session.selectList("com.domain.AuthorMapper.selectAuthor", id);
- assertEquals(1,authors.size());
+ assertEquals(1, authors.size());
session.delete("com.domain.AuthorMapper.deleteAuthor", id);
authors = session.selectList("com.domain.AuthorMapper.selectAuthor", id);
- assertEquals(0,authors.size());
+ assertEquals(0, authors.size());
session.rollback();
authors = session.selectList("com.domain.AuthorMapper.selectAuthor", id);
- assertEquals(1,authors.size());
+ assertEquals(1, authors.size());
} finally {
session.close();
@@ -181,9 +180,9 @@
Blog blog = (Blog) session.selectOne("com.domain.BlogMapper.selectBlogWithPostsUsingSubSelect", 1);
assertEquals("Jim Business", blog.getTitle());
assertEquals(2, blog.getPosts().size());
- assertEquals("Corn nuts",blog.getPosts().get(0).getSubject());
- assertEquals(101,blog.getAuthor().getId());
- assertEquals("jim",blog.getAuthor().getUsername());
+ assertEquals("Corn nuts", blog.getPosts().get(0).getSubject());
+ assertEquals(101, blog.getAuthor().getId());
+ assertEquals("jim", blog.getAuthor().getUsername());
} finally {
session.close();
}
@@ -198,7 +197,7 @@
final Author author = blog.getAuthor();
assertEquals(101, author.getId());
- assertEquals("jim",author.getUsername());
+ assertEquals("jim", author.getUsername());
final List<Post> posts = blog.getPosts();
assertEquals(2, posts.size());
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java Thu Jan 22 22:32:36 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 org.junit.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
-import java.util.*;
-import static org.junit.Assert.*;
+import java.util.HashSet;
+import java.util.Set;
public class BaseCacheTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.cache;
-import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.Test;
import java.util.Date;
-import static org.junit.Assert.*;
public class CacheKeyTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java Thu Jan 22 22:32:36 2009
@@ -2,8 +2,8 @@
import org.apache.ibatis.cache.decorators.FifoCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.junit.*;
import static org.junit.Assert.*;
+import org.junit.Test;
public class FifoCacheTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/LruCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/LruCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/LruCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/LruCacheTest.java Thu Jan 22 22:32:36 2009
@@ -2,8 +2,8 @@
import org.apache.ibatis.cache.decorators.LruCache;
import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.junit.*;
import static org.junit.Assert.*;
+import org.junit.Test;
public class LruCacheTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,10 @@
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 org.junit.*;
import static org.junit.Assert.*;
+import org.junit.Test;
public class PerpetualCacheTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,10 @@
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 org.junit.*;
import static org.junit.Assert.*;
+import org.junit.Test;
public class ScheduledCacheTest {
@@ -11,7 +12,7 @@
public void shouldDemonstrateHowAllObjectsAreFlushedAfterBasedOnTime() throws Exception {
Cache cache = new PerpetualCache("DefaultCache");
cache = new ScheduledCache(cache);
- ((ScheduledCache)cache).setClearInterval(2500);
+ ((ScheduledCache) cache).setClearInterval(2500);
cache = new LoggingCache(cache);
for (int i = 0; i < 100; i++) {
cache.putObject(i, i);
@@ -25,7 +26,7 @@
public void shouldRemoveItemOnDemand() {
Cache cache = new PerpetualCache("DefaultCache");
cache = new ScheduledCache(cache);
- ((ScheduledCache)cache).setClearInterval(60000);
+ ((ScheduledCache) cache).setClearInterval(60000);
cache = new LoggingCache(cache);
cache.putObject(0, 0);
assertNotNull(cache.getObject(0));
@@ -37,7 +38,7 @@
public void shouldFlushAllItemsOnDemand() {
Cache cache = new PerpetualCache("DefaultCache");
cache = new ScheduledCache(cache);
- ((ScheduledCache)cache).setClearInterval(60000);
+ ((ScheduledCache) cache).setClearInterval(60000);
cache = new LoggingCache(cache);
for (int i = 0; i < 5; i++) {
cache.putObject(i, i);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java Thu Jan 22 22:32:36 2009
@@ -1,13 +1,14 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
-import org.apache.ibatis.cache.impl.*;
-import org.junit.*;
+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;
public class SoftCacheTest {
- @Test
+ @Test
public void shouldDemonstrateObjectsBeingCollectedAsNeeded() throws Exception {
final int N = 300000;
SoftCache cache = new SoftCache(new PerpetualCache("default"));
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.cache;
-import org.junit.*;
-import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.cache.decorators.*;
-import static org.junit.Assert.*;
+import org.apache.ibatis.cache.impl.PerpetualCache;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
public class SuperCacheTest {
@@ -22,7 +22,7 @@
cache = new TransactionalCache(cache);
for (int i = 0; i < N; i++) {
cache.putObject(i, i);
- ((TransactionalCache)cache).commit();
+ ((TransactionalCache) cache).commit();
Object o = cache.getObject(i);
assertTrue(o == null || i == ((Integer) o));
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,10 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.cache.decorators.*;
-import org.apache.ibatis.cache.impl.*;
-import org.junit.*;
+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.Test;
public class WeakCacheTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,16 +1,22 @@
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.mapping.Configuration;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
-import org.apache.ibatis.mapping.*;
-import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.Test;
import javax.sql.DataSource;
-import java.sql.*;
-import java.util.*;
-import static org.junit.Assert.*;
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public abstract class BaseExecutorTest extends BaseDataTest {
private final Configuration config;
@@ -29,7 +35,7 @@
public void shouldInsertNewAuthor() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(99, "someone", "******", "someone@apache.org", null, Section.NEWS);
MappedStatement insertStatement = ExecutorTestHelper.prepareInsertAuthorMappedStatement(config);
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
@@ -46,7 +52,7 @@
public void shouldSelectAllAuthorsAutoMapped() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectAllAuthorsAutoMappedStatement(config);
List<Author> authors = executor.query(selectStatement, null, Executor.NO_ROW_OFFSET, Executor.NO_ROW_LIMIT, Executor.NO_RESULT_HANDLER);
assertEquals(2, authors.size());
@@ -66,7 +72,7 @@
Connection connection = ds.getConnection();
config.setGeneratedKeysEnabled(true);
try {
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(-1, "someone", "******", "someone@apache.org", null, Section.NEWS);
MappedStatement insertStatement = ExecutorTestHelper.prepareInsertAuthorMappedStatementWithAutoKey(config);
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
@@ -89,7 +95,7 @@
public void shouldInsertNewAuthorByProc() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(97, "someone", "******", "someone@apache.org", null, null);
MappedStatement insertStatement = ExecutorTestHelper.prepareInsertAuthorProc(config);
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
@@ -105,7 +111,7 @@
public void shouldInsertNewAuthorUsingSimpleNonPreparedStatements() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(99, "someone", "******", "someone@apache.org", null, null);
MappedStatement insertStatement = ExecutorTestHelper.createInsertAuthorWithIDof99MappedStatement(config);
MappedStatement selectStatement = ExecutorTestHelper.createSelectAuthorWithIDof99MappedStatement(config);
@@ -122,7 +128,7 @@
public void shouldUpdateAuthor() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(101, "someone", "******", "someone@apache.org", null, Section.NEWS);
MappedStatement updateStatement = ExecutorTestHelper.prepareUpdateAuthorMappedStatement(config);
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
@@ -139,7 +145,7 @@
public void shouldDeleteAuthor() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
Author author = new Author(101, null, null, null, null, null);
MappedStatement deleteStatement = ExecutorTestHelper.prepareDeleteAuthorMappedStatement(config);
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
@@ -155,7 +161,7 @@
public void shouldSelectDiscriminatedProduct() throws Exception {
DataSource ds = createJPetstoreDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectDiscriminatedProduct(config);
List<Map> products = executor.query(selectStatement, null, Executor.NO_ROW_OFFSET, Executor.NO_ROW_LIMIT, Executor.NO_RESULT_HANDLER);
connection.rollback();
@@ -173,7 +179,7 @@
public void shouldSelect10DiscriminatedProducts() throws Exception {
DataSource ds = createJPetstoreDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectDiscriminatedProduct(config);
List<Map> products = executor.query(selectStatement, null, 4, 10, Executor.NO_RESULT_HANDLER);
connection.rollback();
@@ -192,7 +198,7 @@
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
connection.setAutoCommit(false);
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectTwoSetsOfAuthorsProc(config);
List<List> authorSets = executor.query(selectStatement, new HashMap() {
{
@@ -215,7 +221,7 @@
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
connection.setAutoCommit(false);
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectAuthorViaOutParams(config);
Author author = new Author(102, null, null, null, null, null);
executor.query(selectStatement, author, Executor.NO_ROW_OFFSET, Executor.NO_ROW_LIMIT, Executor.NO_RESULT_HANDLER);
@@ -231,7 +237,7 @@
public void shouldFetchPostsForBlog() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
MappedStatement selectPosts = ExecutorTestHelper.prepareSelectPostsForBlogMappedStatement(config);
config.addMappedStatement(selectBlog);
@@ -248,7 +254,7 @@
public void shouldFetchOneOrphanedPostWithNoBlog() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
MappedStatement selectPost = ExecutorTestHelper.prepareSelectPostMappedStatement(config);
config.addMappedStatement(selectBlog);
@@ -265,7 +271,7 @@
public void shouldFetchPostWithBlogWithCompositeKey() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectBlog = ExecutorTestHelper.prepareSelectBlogByIdAndAuthor(config);
MappedStatement selectPost = ExecutorTestHelper.prepareSelectPostWithBlogByAuthorMappedStatement(config);
config.addMappedStatement(selectBlog);
@@ -285,7 +291,7 @@
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
MappedStatement selectPosts = ExecutorTestHelper.prepareSelectPostsForBlogMappedStatement(config);
config.addMappedStatement(selectBlog);
@@ -306,7 +312,7 @@
public void shouldMapConstructorResults() throws Exception {
DataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
- Executor executor = createExecutor(new JdbcTransaction(connection,false));
+ Executor executor = createExecutor(new JdbcTransaction(connection, false));
MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatementWithConstructorResults(config);
List<Author> authors = executor.query(selectStatement, 102, Executor.NO_ROW_OFFSET, Executor.NO_ROW_LIMIT, Executor.NO_RESULT_HANDLER);
executor.flushStatements();
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BatchExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BatchExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BatchExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BatchExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
+import org.junit.Test;
public class BatchExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingBatchExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingBatchExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingBatchExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingBatchExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
-
-import java.sql.Connection;
+import org.junit.Test;
public class CachingBatchExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingReuseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingReuseExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingReuseExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingReuseExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
-
-import java.sql.Connection;
+import org.junit.Test;
public class CachingReuseExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingSimpleExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingSimpleExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingSimpleExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/CachingSimpleExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
-
-import java.sql.Connection;
+import org.junit.Test;
public class CachingSimpleExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java Thu Jan 22 22:32:36 2009
@@ -2,10 +2,14 @@
import domain.blog.*;
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.mapping.*;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.util.*;
@@ -147,7 +151,7 @@
add(new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() {
{
add(new ResultMapping.Builder(config, "favouriteSection", "favourite_section", registry.getTypeHandler(Section.class)).build());
- add(new ResultMapping.Builder(config, null, "not_exists",Object.class).build());
+ add(new ResultMapping.Builder(config, null, "not_exists", Object.class).build());
}
}).build());
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ReuseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ReuseExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ReuseExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ReuseExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
-
-import java.sql.Connection;
+import org.junit.Test;
public class ReuseExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SerializableProxyTest.java Thu Jan 22 22:32:36 2009
@@ -1,11 +1,13 @@
package org.apache.ibatis.executor;
-import domain.blog.*;
-import org.apache.ibatis.executor.loader.*;
-import org.junit.*;
+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;
import java.io.*;
-import static org.junit.Assert.*;
public class SerializableProxyTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SimpleExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SimpleExecutorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SimpleExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/SimpleExecutorTest.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,7 @@
package org.apache.ibatis.executor;
-import org.junit.Test;
import org.apache.ibatis.transaction.Transaction;
-
-import java.sql.Connection;
+import org.junit.Test;
public class SimpleExecutorTest extends BaseExecutorTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/io/ResourcesTest.java Thu Jan 22 22:32:36 2009
@@ -1,13 +1,15 @@
package org.apache.ibatis.io;
import org.apache.ibatis.BaseDataTest;
-import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.Test;
-import java.io.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.Properties;
-import static org.junit.Assert.*;
public class ResourcesTest extends BaseDataTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,10 @@
package org.apache.ibatis.jdbc;
-import org.apache.ibatis.type.*;
-import org.junit.*;
-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/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java Thu Jan 22 22:32:36 2009
@@ -2,11 +2,14 @@
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.junit.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
import java.sql.Connection;
-import java.util.*;
-import static org.junit.Assert.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
public class PooledDataSourceTest extends BaseDataTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java Thu Jan 22 22:32:36 2009
@@ -1,17 +1,19 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.io.Resources;
-import org.junit.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
import javax.sql.DataSource;
import java.io.IOException;
-import java.sql.*;
-import java.util.*;
-import static org.junit.Assert.*;
+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/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java Thu Jan 22 22:32:36 2009
@@ -1,14 +1,14 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.Null;
-import org.apache.ibatis.jdbc.SqlRunner;
-import org.junit.*;
+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 static org.junit.Assert.*;
+import java.util.List;
+import java.util.Map;
public class SqlRunnerTest extends BaseDataTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/logging/LogFactoryTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/logging/LogFactoryTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/logging/LogFactoryTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/logging/LogFactoryTest.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.logging;
-import org.junit.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
public class LogFactoryTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java Thu Jan 22 22:32:36 2009
@@ -1,11 +1,13 @@
package org.apache.ibatis.metadata;
import org.apache.ibatis.BaseDataTest;
-import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
import javax.sql.DataSource;
-import java.sql.*;
-import static org.junit.Assert.*;
+import java.sql.Connection;
+import java.sql.Types;
public class MetadataTest extends BaseDataTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Thu Jan 22 22:32:36 2009
@@ -1,18 +1,21 @@
package org.apache.ibatis.migration;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.io.Resources;
-import org.junit.*;
-
-import java.io.*;
-import java.net.URL;
-import java.net.URISyntaxException;
-import java.sql.Connection;
-
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.junit.AfterClass;
import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
import javax.sql.DataSource;
+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 {
@@ -51,36 +54,36 @@
public void shouldRunThroughFullMigrationUseCaseInOneTestToEnsureOrder() throws Exception {
File f = getExampleDir();
- Migrator.main(args("--path="+f.getAbsolutePath(),"bootstrap", "--env=development"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "bootstrap", "--env=development"));
assertTrue(buffer.toString().contains("--// Bootstrap.sql"));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"status"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "status"));
assertTrue(buffer.toString().contains("...pending..."));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"up"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "up"));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"status"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "status"));
assertFalse(buffer.toString().contains("...pending..."));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"down"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "down"));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"status"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "status"));
assertTrue(buffer.toString().contains("...pending..."));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"version", "20080827200215"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "version", "20080827200215"));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"status"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "status"));
assertFalse(buffer.toString().contains("...pending..."));
buffer.clear();
- Migrator.main(args("--path="+f.getAbsolutePath(),"--help"));
+ Migrator.main(args("--path=" + f.getAbsolutePath(), "--help"));
assertTrue(buffer.toString().contains("--help"));
buffer.clear();
}
@@ -89,13 +92,13 @@
@Test
public void shouldInitTempDirectory() throws Exception {
File basePath = getTempDir();
- Migrator.main(args("--path="+basePath.getAbsolutePath(),"init"));
+ Migrator.main(args("--path=" + basePath.getAbsolutePath(), "init"));
assertNotNull(basePath.list());
- assertEquals(4,basePath.list().length);
+ assertEquals(4, basePath.list().length);
File scriptPath = new File(basePath.getCanonicalPath() + File.separator + "scripts");
- assertEquals(3,scriptPath.list().length);
- Migrator.main(args("--path="+basePath.getAbsolutePath(),"new","test new migration"));
- assertEquals(4,scriptPath.list().length);
+ assertEquals(3, scriptPath.list().length);
+ Migrator.main(args("--path=" + basePath.getAbsolutePath(), "new", "test new migration"));
+ assertEquals(4, scriptPath.list().length);
}
private String[] args(String... args) {
@@ -111,7 +114,7 @@
}
private File getTempDir() throws IOException {
- File f = File.createTempFile("migration","test");
+ File f = File.createTempFile("migration", "test");
assertTrue(f.delete());
assertTrue(f.mkdir());
assertTrue(f.exists());
@@ -122,14 +125,16 @@
private static class StringOutputStream extends OutputStream {
private StringBuilder builder = new StringBuilder();
+
public void write(int b) throws IOException {
- builder.append((char)b);
+ builder.append((char) b);
// out.write(b);
}
public String toString() {
return builder.toString();
}
+
public void clear() {
builder.setLength(0);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArithmeticAndLogicalOperatorsTest.java Thu Jan 22 22:32:36 2009
@@ -30,188 +30,181 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import junit.framework.TestSuite;
-public class ArithmeticAndLogicalOperatorsTest extends OgnlTestCase
-{
- private static Object[][] TESTS = {
- // Double-valued arithmetic expressions
- { "-1d", new Double(-1) },
- { "+1d", new Double(1) },
- { "--1f", new Float(1) },
- { "2*2.0", new Double(4) },
- { "5/2.", new Double(2.5) },
- { "5+2D", new Double(7) },
- { "5f-2F", new Float(3) },
- { "5.+2*3", new Double(11) },
- { "(5.+2)*3", new Double(21) },
-
- // BigDecimal-valued arithmetic expressions
- { "-1b", new BigDecimal(-1) },
- { "+1b", new BigDecimal(1) },
- { "--1b", new BigDecimal(1) },
- { "2*2.0b", new BigDecimal("4.0") },
- { "5/2.B", new BigDecimal(2) },
- { "5.0B/2", new BigDecimal(2.5) },
- { "5+2b", new BigDecimal(7) },
- { "5-2B", new BigDecimal(3) },
- { "5.+2b*3", new BigDecimal(11) },
- { "(5.+2b)*3", new BigDecimal(21) },
-
- // Integer-valued arithmetic expressions
- { "-1", new Integer(-1) },
- { "+1", new Integer(1) },
- { "--1", new Integer(1) },
- { "2*2", new Integer(4) },
- { "5/2", new Integer(2) },
- { "5+2", new Integer(7) },
- { "5-2", new Integer(3) },
- { "5+2*3", new Integer(11) },
- { "(5+2)*3", new Integer(21) },
- { "~1", new Integer(~1) },
- { "5%2", new Integer(1) },
- { "5<<2", new Integer(20) },
- { "5>>2", new Integer(1) },
- { "5>>1+1", new Integer(1) },
- { "-5>>>2", new Integer(-5>>>2) },
- { "-5L>>>2", new Long(-5L>>>2) },
- { "5. & 3", new Double(1) },
- { "5 ^3", new Integer(6) },
- { "5l&3|5^3", new Long(7) },
- { "5&(3|5^3)", new Integer(5) },
-
- // BigInteger-valued arithmetic expressions
- { "-1h", BigInteger.valueOf(-1) },
- { "+1H", BigInteger.valueOf(1) },
- { "--1h", BigInteger.valueOf(1) },
- { "2h*2", BigInteger.valueOf(4) },
- { "5/2h", BigInteger.valueOf(2) },
- { "5h+2", BigInteger.valueOf(7) },
- { "5-2h", BigInteger.valueOf(3) },
- { "5+2H*3", BigInteger.valueOf(11) },
- { "(5+2H)*3", BigInteger.valueOf(21) },
- { "~1h", BigInteger.valueOf(~1) },
- { "5h%2", BigInteger.valueOf(1) },
- { "5h<<2", BigInteger.valueOf(20) },
- { "5h>>2", BigInteger.valueOf(1) },
- { "5h>>1+1", BigInteger.valueOf(1) },
- { "-5h>>>2", BigInteger.valueOf(-2) },
- { "5.b & 3", BigInteger.valueOf(1) },
- { "5h ^3", BigInteger.valueOf(6) },
- { "5h&3|5^3", BigInteger.valueOf(7) },
- { "5H&(3|5^3)", BigInteger.valueOf(5) },
-
- // Logical expressions
- { "!1", Boolean.FALSE },
- { "!null", Boolean.TRUE },
- { "5<2", Boolean.FALSE },
- { "5>2", Boolean.TRUE },
- { "5<=5", Boolean.TRUE },
- { "5>=3", Boolean.TRUE },
- { "5<-5>>>2", Boolean.TRUE },
- { "5==5.0", Boolean.TRUE },
- { "5!=5.0", Boolean.FALSE },
- { "null in {true,false,null}", Boolean.TRUE },
- { "null not in {true,false,null}", Boolean.FALSE },
- { "null in {true,false,null}.toArray()", Boolean.TRUE },
- { "5 in {true,false,null}", Boolean.FALSE },
- { "5 not in {true,false,null}", Boolean.TRUE },
- { "5 instanceof java.lang.Integer", Boolean.TRUE },
- { "5. instanceof java.lang.Integer", Boolean.FALSE },
-
- // Logical expressions (string versions)
- { "2 or 0", new Integer(2) },
- { "1 and 0", new Integer(0) },
- { "1 bor 0", new Integer(1) },
- { "1 xor 0", new Integer(1) },
- { "1 band 0", new Integer(0) },
- { "1 eq 1", Boolean.TRUE },
- { "1 neq 1", Boolean.FALSE },
- { "1 lt 5", Boolean.TRUE },
- { "1 lte 5", Boolean.TRUE },
- { "1 gt 5", Boolean.FALSE },
- { "1 gte 5", Boolean.FALSE },
- { "1 lt 5", Boolean.TRUE },
- { "1 shl 2", new Integer(4) },
- { "4 shr 2", new Integer(1) },
- { "4 ushr 2", new Integer(1) },
- { "not null", Boolean.TRUE },
- { "not 1", Boolean.FALSE },
-
- { "#x > 0", Boolean.TRUE },
- { "#x < 0", Boolean.FALSE },
- { "#x == 0", Boolean.FALSE },
- { "#x == 1", Boolean.TRUE },
- { "0 > #x", Boolean.FALSE },
- { "0 < #x", Boolean.TRUE },
- { "0 == #x", Boolean.FALSE },
- { "1 == #x", Boolean.TRUE },
- { "\"1\" > 0", Boolean.TRUE },
- { "\"1\" < 0", Boolean.FALSE },
- { "\"1\" == 0", Boolean.FALSE },
- { "\"1\" == 1", Boolean.TRUE },
- { "0 > \"1\"", Boolean.FALSE },
- { "0 < \"1\"", Boolean.TRUE },
- { "0 == \"1\"", Boolean.FALSE },
- { "1 == \"1\"", Boolean.TRUE },
- { "#x + 1", "11" },
- { "1 + #x", "11" },
- { "#y == 1", Boolean.TRUE },
- { "#y == \"1\"", Boolean.TRUE },
- { "#y + \"1\"", "11" },
- { "\"1\" + #y", "11" }
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- result.addTest(new ArithmeticAndLogicalOperatorsTest((String)TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String)TESTS[i][0], TESTS[i][1]));
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public ArithmeticAndLogicalOperatorsTest()
- {
- super();
- }
-
- public ArithmeticAndLogicalOperatorsTest(String name)
- {
- super(name);
- }
-
- public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
-
- public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
- }
-
- public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+import java.math.BigDecimal;
+import java.math.BigInteger;
- /*===================================================================
- Overridden methods
- ===================================================================*/
- protected void setUp()
- {
- super.setUp();
- context.put("x", "1");
- context.put("y", new BigDecimal(1));
- }
+public class ArithmeticAndLogicalOperatorsTest extends OgnlTestCase {
+ private static Object[][] TESTS = {
+ // Double-valued arithmetic expressions
+ {"-1d", new Double(-1)},
+ {"+1d", new Double(1)},
+ {"--1f", new Float(1)},
+ {"2*2.0", new Double(4)},
+ {"5/2.", new Double(2.5)},
+ {"5+2D", new Double(7)},
+ {"5f-2F", new Float(3)},
+ {"5.+2*3", new Double(11)},
+ {"(5.+2)*3", new Double(21)},
+
+ // BigDecimal-valued arithmetic expressions
+ {"-1b", new BigDecimal(-1)},
+ {"+1b", new BigDecimal(1)},
+ {"--1b", new BigDecimal(1)},
+ {"2*2.0b", new BigDecimal("4.0")},
+ {"5/2.B", new BigDecimal(2)},
+ {"5.0B/2", new BigDecimal(2.5)},
+ {"5+2b", new BigDecimal(7)},
+ {"5-2B", new BigDecimal(3)},
+ {"5.+2b*3", new BigDecimal(11)},
+ {"(5.+2b)*3", new BigDecimal(21)},
+
+ // Integer-valued arithmetic expressions
+ {"-1", new Integer(-1)},
+ {"+1", new Integer(1)},
+ {"--1", new Integer(1)},
+ {"2*2", new Integer(4)},
+ {"5/2", new Integer(2)},
+ {"5+2", new Integer(7)},
+ {"5-2", new Integer(3)},
+ {"5+2*3", new Integer(11)},
+ {"(5+2)*3", new Integer(21)},
+ {"~1", new Integer(~1)},
+ {"5%2", new Integer(1)},
+ {"5<<2", new Integer(20)},
+ {"5>>2", new Integer(1)},
+ {"5>>1+1", new Integer(1)},
+ {"-5>>>2", new Integer(-5 >>> 2)},
+ {"-5L>>>2", new Long(-5L >>> 2)},
+ {"5. & 3", new Double(1)},
+ {"5 ^3", new Integer(6)},
+ {"5l&3|5^3", new Long(7)},
+ {"5&(3|5^3)", new Integer(5)},
+
+ // BigInteger-valued arithmetic expressions
+ {"-1h", BigInteger.valueOf(-1)},
+ {"+1H", BigInteger.valueOf(1)},
+ {"--1h", BigInteger.valueOf(1)},
+ {"2h*2", BigInteger.valueOf(4)},
+ {"5/2h", BigInteger.valueOf(2)},
+ {"5h+2", BigInteger.valueOf(7)},
+ {"5-2h", BigInteger.valueOf(3)},
+ {"5+2H*3", BigInteger.valueOf(11)},
+ {"(5+2H)*3", BigInteger.valueOf(21)},
+ {"~1h", BigInteger.valueOf(~1)},
+ {"5h%2", BigInteger.valueOf(1)},
+ {"5h<<2", BigInteger.valueOf(20)},
+ {"5h>>2", BigInteger.valueOf(1)},
+ {"5h>>1+1", BigInteger.valueOf(1)},
+ {"-5h>>>2", BigInteger.valueOf(-2)},
+ {"5.b & 3", BigInteger.valueOf(1)},
+ {"5h ^3", BigInteger.valueOf(6)},
+ {"5h&3|5^3", BigInteger.valueOf(7)},
+ {"5H&(3|5^3)", BigInteger.valueOf(5)},
+
+ // Logical expressions
+ {"!1", Boolean.FALSE},
+ {"!null", Boolean.TRUE},
+ {"5<2", Boolean.FALSE},
+ {"5>2", Boolean.TRUE},
+ {"5<=5", Boolean.TRUE},
+ {"5>=3", Boolean.TRUE},
+ {"5<-5>>>2", Boolean.TRUE},
+ {"5==5.0", Boolean.TRUE},
+ {"5!=5.0", Boolean.FALSE},
+ {"null in {true,false,null}", Boolean.TRUE},
+ {"null not in {true,false,null}", Boolean.FALSE},
+ {"null in {true,false,null}.toArray()", Boolean.TRUE},
+ {"5 in {true,false,null}", Boolean.FALSE},
+ {"5 not in {true,false,null}", Boolean.TRUE},
+ {"5 instanceof java.lang.Integer", Boolean.TRUE},
+ {"5. instanceof java.lang.Integer", Boolean.FALSE},
+
+ // Logical expressions (string versions)
+ {"2 or 0", new Integer(2)},
+ {"1 and 0", new Integer(0)},
+ {"1 bor 0", new Integer(1)},
+ {"1 xor 0", new Integer(1)},
+ {"1 band 0", new Integer(0)},
+ {"1 eq 1", Boolean.TRUE},
+ {"1 neq 1", Boolean.FALSE},
+ {"1 lt 5", Boolean.TRUE},
+ {"1 lte 5", Boolean.TRUE},
+ {"1 gt 5", Boolean.FALSE},
+ {"1 gte 5", Boolean.FALSE},
+ {"1 lt 5", Boolean.TRUE},
+ {"1 shl 2", new Integer(4)},
+ {"4 shr 2", new Integer(1)},
+ {"4 ushr 2", new Integer(1)},
+ {"not null", Boolean.TRUE},
+ {"not 1", Boolean.FALSE},
+
+ {"#x > 0", Boolean.TRUE},
+ {"#x < 0", Boolean.FALSE},
+ {"#x == 0", Boolean.FALSE},
+ {"#x == 1", Boolean.TRUE},
+ {"0 > #x", Boolean.FALSE},
+ {"0 < #x", Boolean.TRUE},
+ {"0 == #x", Boolean.FALSE},
+ {"1 == #x", Boolean.TRUE},
+ {"\"1\" > 0", Boolean.TRUE},
+ {"\"1\" < 0", Boolean.FALSE},
+ {"\"1\" == 0", Boolean.FALSE},
+ {"\"1\" == 1", Boolean.TRUE},
+ {"0 > \"1\"", Boolean.FALSE},
+ {"0 < \"1\"", Boolean.TRUE},
+ {"0 == \"1\"", Boolean.FALSE},
+ {"1 == \"1\"", Boolean.TRUE},
+ {"#x + 1", "11"},
+ {"1 + #x", "11"},
+ {"#y == 1", Boolean.TRUE},
+ {"#y == \"1\"", Boolean.TRUE},
+ {"#y + \"1\"", "11"},
+ {"\"1\" + #y", "11"}
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+
+ for (int i = 0; i < TESTS.length; i++) {
+ result.addTest(new ArithmeticAndLogicalOperatorsTest((String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String) TESTS[i][0], TESTS[i][1]));
+ }
+ return result;
+ }
+
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public ArithmeticAndLogicalOperatorsTest() {
+ super();
+ }
+
+ public ArithmeticAndLogicalOperatorsTest(String name) {
+ super(name);
+ }
+
+ public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public ArithmeticAndLogicalOperatorsTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
+
+ /*===================================================================
+ Overridden methods
+ ===================================================================*/
+ protected void setUp() {
+ super.setUp();
+ context.put("x", "1");
+ context.put("y", new BigDecimal(1));
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ArrayCreationTest.java Thu Jan 22 22:32:36 2009
@@ -31,79 +31,71 @@
package org.apache.ibatis.ognl;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.ExpressionSyntaxException;
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();
-
- private static Object[][] TESTS = {
- // Array creation
- { ROOT, "new String[] { \"one\", \"two\" }", new String[] { "one", "two" } },
- { ROOT, "new String[] { 1, 2 }", new String[] { "1", "2" } },
- { ROOT, "new Integer[] { \"1\", 2, \"3\" }", new Integer[] { new Integer(1), new Integer(2), new Integer(3) } },
- { ROOT, "new String[10]", new String[10] },
- { ROOT, "new Object[4] { #root, #this }", ExpressionSyntaxException.class },
- { ROOT, "new Object[4]", new Object[4] },
- { ROOT, "new Object[] { #root, #this }", new Object[] { ROOT, ROOT } },
- { ROOT, "new org.apache.ibatis.ognl.objects.Simple[] { new org.apache.ibatis.ognl.objects.Simple(), new org.apache.ibatis.ognl.objects.Simple(\"foo\", 1.0, 2) }", new Simple[] { new Simple(), new Simple("foo", 1.0f, 2) } },
- { ROOT, "new org.apache.ibatis.ognl.objects.Simple[5]", new Simple[5] },
- { ROOT, "new org.apache.ibatis.ognl.objects.Simple(new Object[5])", new Simple(new Object[5]) },
- { ROOT, "new org.apache.ibatis.ognl.objects.Simple(new String[5])", new Simple(new String[5]) },
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- if (TESTS[i].length == 3) {
- result.addTest(new ArrayCreationTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2]));
- } else {
- if (TESTS[i].length == 4) {
- result.addTest(new ArrayCreationTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3]));
- } else {
- if (TESTS[i].length == 5) {
- result.addTest(new ArrayCreationTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
- } else {
- throw new RuntimeException("don't understand TEST format");
- }
- }
- }
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public ArrayCreationTest()
- {
- super();
- }
-
- public ArrayCreationTest(String name)
- {
- super(name);
- }
-
- public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class ArrayCreationTest extends OgnlTestCase {
+ private static Root ROOT = new Root();
- public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ private static Object[][] TESTS = {
+ // Array creation
+ {ROOT, "new String[] { \"one\", \"two\" }", new String[]{"one", "two"}},
+ {ROOT, "new String[] { 1, 2 }", new String[]{"1", "2"}},
+ {ROOT, "new Integer[] { \"1\", 2, \"3\" }", new Integer[]{new Integer(1), new Integer(2), new Integer(3)}},
+ {ROOT, "new String[10]", new String[10]},
+ {ROOT, "new Object[4] { #root, #this }", ExpressionSyntaxException.class},
+ {ROOT, "new Object[4]", new Object[4]},
+ {ROOT, "new Object[] { #root, #this }", new Object[]{ROOT, ROOT}},
+ {ROOT, "new org.apache.ibatis.ognl.objects.Simple[] { new org.apache.ibatis.ognl.objects.Simple(), new org.apache.ibatis.ognl.objects.Simple(\"foo\", 1.0, 2) }", new Simple[]{new Simple(), new Simple("foo", 1.0f, 2)}},
+ {ROOT, "new org.apache.ibatis.ognl.objects.Simple[5]", new Simple[5]},
+ {ROOT, "new org.apache.ibatis.ognl.objects.Simple(new Object[5])", new Simple(new Object[5])},
+ {ROOT, "new org.apache.ibatis.ognl.objects.Simple(new String[5])", new Simple(new String[5])},
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+
+ for (int i = 0; i < TESTS.length; i++) {
+ if (TESTS[i].length == 3) {
+ result.addTest(new ArrayCreationTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2]));
+ } else {
+ if (TESTS[i].length == 4) {
+ result.addTest(new ArrayCreationTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3]));
+ } else {
+ if (TESTS[i].length == 5) {
+ result.addTest(new ArrayCreationTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
+ } else {
+ throw new RuntimeException("don't understand TEST format");
+ }
+ }
+ }
}
+ return result;
+ }
- public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public ArrayCreationTest() {
+ super();
+ }
+
+ public ArrayCreationTest(String name) {
+ super(name);
+ }
+
+ public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public ArrayCreationTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}