You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dg...@apache.org on 2003/10/24 04:26:59 UTC
cvs commit: jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils BaseTestCase.java
dgraham 2003/10/23 19:26:59
Modified: dbutils/src/test/org/apache/commons/dbutils
BaseTestCase.java
Added: dbutils/src/test/org/apache/commons/dbutils/driver
StringTrimmedResultSetTest.java
Log:
Renamed StringTrimmedResultSetTestCase to
StringTrimmedResultSetTest to match other tests and
fixed it for the new StringTrimmedResultSet implementation.
Revision Changes Path
1.1 jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/driver/StringTrimmedResultSetTest.java
Index: StringTrimmedResultSetTest.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/driver/StringTrimmedResultSetTest.java,v 1.1 2003/10/24 02:26:59 dgraham Exp $
* $Revision: 1.1 $
* $Date: 2003/10/24 02:26:59 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgement may appear in the software itself,
* if and wherever such third-party acknowledgements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.commons.dbutils.driver;
import java.sql.SQLException;
import org.apache.commons.dbutils.BaseTestCase;
/**
* StringTrimmedResultSetTest
*
* @author David Graham
*/
public class StringTrimmedResultSetTest extends BaseTestCase {
public StringTrimmedResultSetTest(String name) {
super(name);
}
public void setUp() throws Exception {
super.setUp();
this.rs = StringTrimmedResultSet.wrap(this.rs);
}
public void testGetString() throws SQLException {
this.rs.next();
assertEquals("notInBean", rs.getString(4));
}
public void testGetObject() throws SQLException {
this.rs.next();
assertEquals("notInBean", rs.getObject(4));
}
}
1.5 +9 -6 jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/BaseTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseTestCase.java 23 Oct 2003 02:25:09 -0000 1.4
+++ BaseTestCase.java 24 Oct 2003 02:26:59 -0000 1.5
@@ -68,6 +68,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.commons.dbutils.driver.StringTrimmedResultSetTest;
import org.apache.commons.dbutils.handlers.ArrayHandlerTest;
import org.apache.commons.dbutils.handlers.ArrayListHandlerTest;
import org.apache.commons.dbutils.handlers.BeanHandlerTest;
@@ -87,12 +88,12 @@
private static final String[] columnNames =
new String[] { "one", "two", "three", "notInBean" };
- private static final ResultSetMetaData metaData =
+ protected static final ResultSetMetaData metaData =
MockResultSetMetaData.create(columnNames);
private static final Object[][] rows =
- new Object[][] { { "1", "2", "3", "notInBean1" }, {
- "4", "5", "6", "notInBean2" }
+ new Object[][] { { "1", "2", "3", " notInBean " }, {
+ "4", "5", "6", " notInBean " }
};
/**
@@ -142,6 +143,8 @@
suite.addTestSuite(MapHandlerTest.class);
suite.addTestSuite(MapListHandlerTest.class);
suite.addTestSuite(ScalarHandlerTest.class);
+
+ suite.addTestSuite(StringTrimmedResultSetTest.class);
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org