dgraham 2003/10/22 18:57:54 Modified: dbutils/src/test/org/apache/commons/dbutils BaseTestCase.java Added: dbutils/src/test/org/apache/commons/dbutils/handlers MapHandlerTest.java MapListHandlerTest.java Log: Added tests for Map handlers. Revision Changes Path 1.3 +8 -4 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BaseTestCase.java 23 Oct 2003 01:26:22 -0000 1.2 +++ BaseTestCase.java 23 Oct 2003 01:57:54 -0000 1.3 @@ -72,6 +72,8 @@ import org.apache.commons.dbutils.handlers.ArrayListHandlerTest; import org.apache.commons.dbutils.handlers.BeanHandlerTest; import org.apache.commons.dbutils.handlers.BeanListHandlerTest; +import org.apache.commons.dbutils.handlers.MapHandlerTest; +import org.apache.commons.dbutils.handlers.MapListHandlerTest; /** * BaseTestCase is the base class for all test cases as well as the "all tests" @@ -136,7 +138,9 @@ suite.addTestSuite(ArrayListHandlerTest.class); suite.addTestSuite(BeanHandlerTest.class); suite.addTestSuite(BeanListHandlerTest.class); - + suite.addTestSuite(MapHandlerTest.class); + suite.addTestSuite(MapListHandlerTest.class); + return suite; } 1.1 jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/handlers/MapHandlerTest.java Index: MapHandlerTest.java =================================================================== /* * $Header: /home/cvs/jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/handlers/MapHandlerTest.java,v 1.1 2003/10/23 01:57:54 dgraham Exp $ * $Revision: 1.1 $ * $Date: 2003/10/23 01:57:54 $ * * ==================================================================== * * 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 [EMAIL PROTECTED] * * 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.handlers; import java.sql.SQLException; import java.util.Map; import org.apache.commons.dbutils.BaseTestCase; import org.apache.commons.dbutils.ResultSetHandler; /** * MapHandlerTest * * @author David Graham */ public class MapHandlerTest extends BaseTestCase { /** * Constructor for MapHandlerTest. */ public MapHandlerTest(String name) { super(name); } public void testHandle() throws SQLException { ResultSetHandler h = new MapHandler(); Map results = (Map) h.handle(this.rs); assertNotNull(results); assertEquals(4, results.keySet().size()); assertEquals("1", results.get("ONE")); assertEquals("2", results.get("two")); assertEquals("3", results.get("Three")); } public void testEmptyResultSetHandle() throws SQLException { ResultSetHandler h = new MapHandler(); Map results = (Map) h.handle(this.emptyResultSet); assertNull(results); } } 1.1 jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/handlers/MapListHandlerTest.java Index: MapListHandlerTest.java =================================================================== /* * $Header: /home/cvs/jakarta-commons-sandbox/dbutils/src/test/org/apache/commons/dbutils/handlers/MapListHandlerTest.java,v 1.1 2003/10/23 01:57:54 dgraham Exp $ * $Revision: 1.1 $ * $Date: 2003/10/23 01:57:54 $ * * ==================================================================== * * 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 [EMAIL PROTECTED] * * 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.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; /** * MapListHandlerTest * * @author David Graham */ public class MapListHandlerTest extends BaseTestCase { /** * Constructor for MapListHandlerTest. */ public MapListHandlerTest(String name) { super(name); } public void testHandle() throws SQLException { ResultSetHandler h = new MapListHandler(); List results = (List) h.handle(this.rs); assertNotNull(results); assertEquals(2, results.size()); Iterator iter = results.iterator(); Map row = null; while (iter.hasNext()) { row = (Map) iter.next(); assertEquals(4, row.keySet().size()); } assertEquals("4", row.get("one")); assertEquals("5", row.get("TWO")); assertEquals("6", row.get("Three")); } public void testEmptyResultSetHandle() throws SQLException { ResultSetHandler h = new MapListHandler(); List results = (List) h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]