You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/12/30 22:56:17 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap TestAbstractOrderedBidiMapDecorator.java TestAll.java TestTreeBidiMap.java
scolebourne 2003/12/30 13:56:17
Modified: collections/src/test/org/apache/commons/collections/bidimap
TestAll.java TestTreeBidiMap.java
Added: collections/src/test/org/apache/commons/collections/bidimap
TestAbstractOrderedBidiMapDecorator.java
Log:
Improve BidiMap testing
Revision Changes Path
1.4 +3 -2 jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestAll.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestAll.java 3 Dec 2003 14:03:35 -0000 1.3
+++ TestAll.java 30 Dec 2003 21:56:17 -0000 1.4
@@ -87,6 +87,7 @@
suite.addTest(TestDualTreeBidiMap.suite());
suite.addTest(TestTreeBidiMap.suite());
+ suite.addTest(TestAbstractOrderedBidiMapDecorator.suite());
suite.addTest(TestUnmodifiableBidiMap.suite());
suite.addTest(TestUnmodifiableOrderedBidiMap.suite());
suite.addTest(TestUnmodifiableSortedBidiMap.suite());
1.4 +3 -3 jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
Index: TestTreeBidiMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestTreeBidiMap.java 1 Dec 2003 22:34:54 -0000 1.3
+++ TestTreeBidiMap.java 30 Dec 2003 21:56:17 -0000 1.4
@@ -73,7 +73,7 @@
*
* @author Stephen Colebourne
*/
-public class TestTreeBidiMap extends AbstractTestBidiMap {
+public class TestTreeBidiMap extends AbstractTestOrderedBidiMap {
public static void main(String[] args) {
TestRunner.run(suite());
1.1 jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
Index: TestAbstractOrderedBidiMapDecorator.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java,v 1.1 2003/12/30 21:56:17 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-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.collections.bidimap;
import java.util.Map;
import java.util.TreeMap;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.OrderedBidiMap;
/**
* Test class for AbstractOrderedBidiMapDecorator.
*
* @version $Revision: 1.1 $ $Date: 2003/12/30 21:56:17 $
*/
public class TestAbstractOrderedBidiMapDecorator
extends AbstractTestOrderedBidiMap {
public TestAbstractOrderedBidiMapDecorator(String testName) {
super(testName);
}
public static Test suite() {
return new TestSuite(TestAbstractOrderedBidiMapDecorator.class);
}
public BidiMap makeEmptyBidiMap() {
return new TestOrderedBidiMap();
}
public Map makeConfirmedMap() {
return new TreeMap();
}
public boolean isAllowNullKey() {
return false;
}
public boolean isAllowNullValue() {
return false;
}
public boolean isSetValueSupported() {
return true;
}
/**
* Simple class to actually test.
*/
private static final class TestOrderedBidiMap extends AbstractOrderedBidiMapDecorator {
private TestOrderedBidiMap inverse = null;
public TestOrderedBidiMap() {
super(new DualTreeBidiMap());
}
public TestOrderedBidiMap(OrderedBidiMap map) {
super(map);
}
public BidiMap inverseBidiMap() {
if (inverse == null) {
inverse = new TestOrderedBidiMap((OrderedBidiMap) getBidiMap().inverseBidiMap());
inverse.inverse = this;
}
return inverse;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org