You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ws...@apache.org on 2013/03/10 15:54:36 UTC
svn commit: r1454860 [2/2] - in /commons/proper/dbutils/branches/2_0/src:
main/java/org/apache/commons/dbutils/
main/java/org/apache/commons/dbutils/handlers/
main/java/org/apache/commons/dbutils/wrappers/
main/java/org/apache/commons/dbutils2/ main/ja...
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AsyncExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AsyncExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AsyncExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
@@ -22,6 +22,13 @@ import static org.mockito.Mockito.verify
import java.sql.SQLException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
+
+import org.apache.commons.dbutils2.AsyncExecutor;
+import org.apache.commons.dbutils2.InsertExecutor;
+import org.apache.commons.dbutils2.QueryExecutor;
+import org.apache.commons.dbutils2.QueryRunner;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.UpdateExecutor;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseResultSetHandlerTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseResultSetHandlerTestCase.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseResultSetHandlerTestCase.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.sql.SQLException;
import java.util.Collection;
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import org.apache.commons.dbutils2.BaseResultSetHandler;
import org.junit.Test;
public final class BaseResultSetHandlerTestCase extends BaseTestCase {
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseTestCase.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseTestCase.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.math.BigInteger;
import java.sql.ResultSet;
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.sql.SQLException;
import java.text.DateFormat;
@@ -24,6 +24,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.commons.dbutils2.BasicRowProcessor;
+import org.apache.commons.dbutils2.RowProcessor;
+
/**
* Test the BasicRowProcessor class.
*/
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BatchExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BatchExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BatchExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BatchExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BatchExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BatchExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BatchExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+
+import org.apache.commons.dbutils2.BatchExecutor;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -23,6 +23,9 @@ import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.dbutils2.BeanProcessor;
+import org.apache.commons.dbutils2.ProxyFactory;
+
public class BeanProcessorTest extends BaseTestCase {
private static final BeanProcessor beanProc = new BeanProcessor();
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.doThrow;
@@ -26,6 +26,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import org.apache.commons.dbutils2.DbUtils;
import org.junit.Test;
public class DbUtilsTest {
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/GenerousBeanProcessorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/GenerousBeanProcessorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/GenerousBeanProcessorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/GenerousBeanProcessorTest.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
import java.beans.PropertyDescriptor;
import java.sql.ResultSetMetaData;
+
+import org.apache.commons.dbutils2.GenerousBeanProcessor;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/InsertExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/InsertExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/InsertExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/InsertExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/InsertExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/InsertExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/InsertExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
@@ -25,6 +25,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+
+import org.apache.commons.dbutils2.InsertExecutor;
+import org.apache.commons.dbutils2.ResultSetHandler;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSet.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSet.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSet.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -26,6 +26,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.dbutils2.ProxyFactory;
+
/**
* MockResultSet dynamically implements the ResultSet interface.
*/
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java Sun Mar 10 14:54:34 2013
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.sql.ResultSetMetaData;
+import org.apache.commons.dbutils2.ProxyFactory;
+
/**
* MockResultSetMetaData dynamically implements the ResultSetMetaData
* interface.
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ProxyFactoryTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ProxyFactoryTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ProxyFactoryTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java Sun Mar 10 14:54:34 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import org.apache.commons.dbutils2.ProxyFactory;
+
/**
* ProxyFactoryTest performs simple type checking on proxy objects returned
* from a ProxyFactory.
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
@@ -25,6 +25,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+
+import org.apache.commons.dbutils2.QueryExecutor;
+import org.apache.commons.dbutils2.ResultSetHandler;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java Sun Mar 10 14:54:34 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.io.IOException;
import java.util.Map;
+import org.apache.commons.dbutils2.QueryLoader;
+
/**
* QueryLoaderTest
*/
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.times;
@@ -23,6 +23,8 @@ import static org.mockito.Mockito.when;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
+
+import org.apache.commons.dbutils2.QueryRunner;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java Sun Mar 10 14:54:34 2013
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import java.util.Iterator;
+import org.apache.commons.dbutils2.ResultSetIterator;
+
/**
* ResultSetIteratorTest
*/
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/TestBean.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/TestBean.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/TestBean.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
/**
* A bean to use in testing toBean() and toBeanList().
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/UpdateExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/UpdateExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/UpdateExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/UpdateExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/UpdateExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/UpdateExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/UpdateExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+
+import org.apache.commons.dbutils2.UpdateExecutor;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.ArrayHandler;
/**
* ArrayHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayListHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayListHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayListHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayListHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.ArrayListHandler;
/**
* ArrayListHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.TestBean;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.TestBean;
+import org.apache.commons.dbutils2.handlers.BeanHandler;
/**
* BeanHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanListHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanListHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanListHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanListHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.TestBean;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.TestBean;
+import org.apache.commons.dbutils2.handlers.BeanListHandler;
/**
* BeanListHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanMapHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanMapHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanMapHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanMapHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
@@ -23,8 +23,9 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.util.Map;
-import org.apache.commons.dbutils.RowProcessor;
-import org.apache.commons.dbutils.TestBean;
+import org.apache.commons.dbutils2.RowProcessor;
+import org.apache.commons.dbutils2.TestBean;
+import org.apache.commons.dbutils2.handlers.BeanMapHandler;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ColumnListHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ColumnListHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ColumnListHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ColumnListHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.List;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.ColumnListHandler;
/**
* ColumnListHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/KeyedHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/KeyedHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/KeyedHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/KeyedHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.KeyedHandler;
public class KeyedHandlerTest extends BaseTestCase {
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.Map;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.MapHandler;
/**
* MapHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapListHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapListHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapListHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapListHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.MapListHandler;
/**
* MapListHandlerTest
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ScalarHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ScalarHandlerTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ScalarHandlerTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ScalarHandlerTest.java Sun Mar 10 14:54:34 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
import java.sql.SQLException;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.handlers.ScalarHandler;
public class ScalarHandlerTest extends BaseTestCase {
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSetTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSetTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSetTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.wrappers;
+package org.apache.commons.dbutils2.wrappers;
import java.io.ByteArrayInputStream;
import java.io.CharArrayReader;
@@ -38,8 +38,9 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Map;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.ProxyFactory;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.ProxyFactory;
+import org.apache.commons.dbutils2.wrappers.SqlNullCheckedResultSet;
/**
* Test cases for <code>SqlNullCheckedResultSet</code> class.
@@ -56,9 +57,9 @@ public class SqlNullCheckedResultSetTest
super.setUp();
rs2 =
- new SqlNullCheckedResultSet(
- ProxyFactory.instance().createResultSet(
- new SqlNullUncheckedMockResultSet()));
+ new SqlNullCheckedResultSet(
+ ProxyFactory.instance().createResultSet(
+ new SqlNullUncheckedMockResultSet()));
rs = ProxyFactory.instance().createResultSet(rs2); // Override superclass field
}
@@ -469,16 +470,16 @@ public class SqlNullCheckedResultSetTest
* Uses reflection to allow for building under JDK 1.3.
*/
public void testURL() throws SQLException, MalformedURLException,
- IllegalAccessException, IllegalArgumentException,
- java.lang.reflect.InvocationTargetException
+ IllegalAccessException, IllegalArgumentException,
+ java.lang.reflect.InvocationTargetException
{
Method getUrlInt = null;
Method getUrlString = null;
try {
getUrlInt = ResultSet.class.getMethod("getURL",
- new Class[] { Integer.TYPE } );
+ new Class[] { Integer.TYPE } );
getUrlString = ResultSet.class.getMethod("getURL",
- new Class[] { String.class } );
+ new Class[] { String.class } );
} catch(NoSuchMethodException e) {
// ignore
} catch(SecurityException e) {
@@ -486,18 +487,18 @@ public class SqlNullCheckedResultSetTest
}
if (getUrlInt != null && getUrlString != null) {
assertEquals(null, getUrlInt.invoke(rs,
- new Object[] { Integer.valueOf(1) } ) );
+ new Object[] { Integer.valueOf(1) } ) );
assertTrue(rs.wasNull());
assertEquals(null, getUrlString.invoke(rs,
- new Object[] { "column" } ) );
+ new Object[] { "column" } ) );
assertTrue(rs.wasNull());
// Set what gets returned to something other than the default
URL u = new URL("http://www.apache.org");
rs2.setNullURL(u);
assertEquals(u, getUrlInt.invoke(rs,
- new Object[] { Integer.valueOf(1) } ) );
+ new Object[] { Integer.valueOf(1) } ) );
assertEquals(u, getUrlString.invoke(rs,
- new Object[] { "column" } ) );
+ new Object[] { "column" } ) );
}
}
@@ -819,7 +820,7 @@ class SqlNullUncheckedMockResultSet impl
*/
@Override
public Object invoke(Object proxy, Method method, Object[] args)
- throws Throwable {
+ throws Throwable {
Class<?> returnType = method.getReturnType();
@@ -892,7 +893,7 @@ class SqlNullCheckedResultSetMockBlob im
@Override
public int setBytes(long pos, byte[] bytes, int offset, int len)
- throws SQLException {
+ throws SQLException {
return 0;
}
@@ -902,7 +903,7 @@ class SqlNullCheckedResultSetMockBlob im
}
/**
- * @throws SQLException
+ * @throws SQLException
*/
@Override
public void free() throws SQLException {
@@ -910,11 +911,11 @@ class SqlNullCheckedResultSetMockBlob im
}
/**
- * @throws SQLException
+ * @throws SQLException
*/
@Override
public InputStream getBinaryStream(long pos, long length) throws SQLException {
- return null;
+ return null;
}
}
@@ -973,12 +974,12 @@ class SqlNullCheckedResultSetMockClob im
@Override
public int setString(long pos, String str, int offset, int len)
- throws SQLException {
+ throws SQLException {
return 0;
}
/**
- * @throws SQLException
+ * @throws SQLException
*/
@Override
public void free() throws SQLException {
@@ -986,11 +987,11 @@ class SqlNullCheckedResultSetMockClob im
}
/**
- * @throws SQLException
+ * @throws SQLException
*/
@Override
public Reader getCharacterStream(long pos, long length) throws SQLException {
- return null;
+ return null;
}
}
Modified: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSetTest.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSetTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSetTest.java Sun Mar 10 14:54:34 2013
@@ -14,14 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.wrappers;
+package org.apache.commons.dbutils2.wrappers;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.dbutils.BaseTestCase;
-import org.apache.commons.dbutils.MockResultSet;
-import org.apache.commons.dbutils.ProxyFactory;
+import org.apache.commons.dbutils2.BaseTestCase;
+import org.apache.commons.dbutils2.MockResultSet;
+import org.apache.commons.dbutils2.ProxyFactory;
+import org.apache.commons.dbutils2.wrappers.SqlNullCheckedResultSet;
+import org.apache.commons.dbutils2.wrappers.StringTrimmedResultSet;
/**
* StringTrimmedResultSetTest