From 486972dbc72b061e1e4a839b04b80f1fdae49890 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 18 Jun 2002 05:41:11 +0000 Subject: [PATCH] Remove use of TestHashMap which didn't really test anything that isn't already tested in TestMap. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130728 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/TestFastHashMap.java | 16 +-- .../commons/collections/TestHashMap.java | 108 ------------------ 2 files changed, 5 insertions(+), 119 deletions(-) delete mode 100644 src/test/org/apache/commons/collections/TestHashMap.java diff --git a/src/test/org/apache/commons/collections/TestFastHashMap.java b/src/test/org/apache/commons/collections/TestFastHashMap.java index 714e7d782..a9fb6be09 100644 --- a/src/test/org/apache/commons/collections/TestFastHashMap.java +++ b/src/test/org/apache/commons/collections/TestFastHashMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ - * $Revision: 1.5 $ - * $Date: 2002/06/18 05:35:58 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.6 2002/06/18 05:41:11 mas Exp $ + * $Revision: 1.6 $ + * $Date: 2002/06/18 05:41:11 $ * * ==================================================================== * @@ -69,9 +69,9 @@ import java.util.Map; /** * @author Jason van Zyl - * @version $Id: TestFastHashMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ + * @version $Id: TestFastHashMap.java,v 1.6 2002/06/18 05:41:11 mas Exp $ */ -public class TestFastHashMap extends TestHashMap +public class TestFastHashMap extends TestMap { public TestFastHashMap(String testName) { @@ -94,10 +94,4 @@ public class TestFastHashMap extends TestHashMap fhm.setFast(false); return (fhm); } - - public void setUp() - { - map = (HashMap) makeEmptyMap(); - } - } diff --git a/src/test/org/apache/commons/collections/TestHashMap.java b/src/test/org/apache/commons/collections/TestHashMap.java deleted file mode 100644 index 30acdd284..000000000 --- a/src/test/org/apache/commons/collections/TestHashMap.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestHashMap.java,v 1.6 2002/02/26 00:31:32 morgand Exp $ - * $Revision: 1.6 $ - * $Date: 2002/02/26 00:31:32 $ - * - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999-2001 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 acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements 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 Group. - * - * 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 - * . - * - */ - -package org.apache.commons.collections; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Jason van Zyl - * @version $Id: TestHashMap.java,v 1.6 2002/02/26 00:31:32 morgand Exp $ - */ -public abstract class TestHashMap extends TestMap -{ - public TestHashMap(String testName) - { - super(testName); - } - - public static void main(String args[]) - { - String[] testCaseName = { TestHashMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - protected HashMap map = null; - - public void setUp() - { - map = (HashMap) makeEmptyMap(); - } - - public void testNewMap() - { - assertTrue("New map is empty", map.isEmpty()); - assertEquals("New map has size zero", map.size(), 0); - } - - public void testSearch() - { - map.put("first", "First Item"); - map.put("second", "Second Item"); - assertEquals("Top item is 'Second Item'", map.get("first"), "First Item"); - assertEquals("Next Item is 'First Item'", map.get("second"), "Second Item"); - } - -}