Improve BidiMap testing

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131487 13f79535-47bb-0310-9956-ffa450edef68

src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java

@@ -0,0 +1,128 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/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;
+        }
+    }
+}

src/test/org/apache/commons/collections/bidimap/TestAll.java

@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/TestAll.java,v 1.3 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/TestAll.java,v 1.4 2003/12/30 21:56:17 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,7 +65,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.4 $ $Date: 2003/12/30 21:56:17 $
  * 
  * @author Stephen Colebourne
  */
@@ -87,6 +87,7 @@ public class TestAll extends TestCase {
         suite.addTest(TestDualTreeBidiMap.suite());
         suite.addTest(TestTreeBidiMap.suite());
         
+        suite.addTest(TestAbstractOrderedBidiMapDecorator.suite());
         suite.addTest(TestUnmodifiableBidiMap.suite());
         suite.addTest(TestUnmodifiableOrderedBidiMap.suite());
         suite.addTest(TestUnmodifiableSortedBidiMap.suite());

src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java

@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java,v 1.3 2003/12/01 22:34:54 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java,v 1.4 2003/12/30 21:56:17 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -69,11 +69,11 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.3 $ $Date: 2003/12/01 22:34:54 $
+ * @version $Revision: 1.4 $ $Date: 2003/12/30 21:56:17 $
  * 
  * @author Stephen Colebourne
  */
-public class TestTreeBidiMap extends AbstractTestBidiMap {
+public class TestTreeBidiMap extends AbstractTestOrderedBidiMap {
 
     public static void main(String[] args) {
         TestRunner.run(suite());