commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/decorators TestPredicatedMap.java TestPredicatedSortedMap.java TestAll.java
Date Sat, 13 Sep 2003 16:12:47 GMT
psteitz     2003/09/13 09:12:47

  Modified:    collections/src/test/org/apache/commons/collections
                        TestMapUtils.java
               collections/src/test/org/apache/commons/collections/decorators
                        TestAll.java
  Added:       collections/src/test/org/apache/commons/collections/decorators
                        TestPredicatedMap.java TestPredicatedSortedMap.java
  Log:
  Added tests for PredicatedMap, PredicatedSortedMap.
  Modified TestMapUtils to test only the factory method for PredicatedMap.
  
  Revision  Changes    Path
  1.11      +10 -57    jakarta-commons/collections/src/test/org/apache/commons/collections/TestMapUtils.java
  
  Index: TestMapUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMapUtils.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestMapUtils.java	31 Aug 2003 17:52:13 -0000	1.10
  +++ TestMapUtils.java	13 Sep 2003 16:12:47 -0000	1.11
  @@ -68,6 +68,8 @@
   import java.util.Set;
   import java.util.TreeMap;
   
  +import org.apache.commons.collections.decorators.PredicatedMap;
  +
   import junit.framework.Test;
   
   /**
  @@ -98,49 +100,17 @@
           };
       }
   
  -
  -    public void testPredicatedMapIllegalPut() {
  +    public void testPredicatedMap() {
           Predicate p = getPredicate();
           Map map = MapUtils.predicatedMap(new HashMap(), p, p);
  +        assertTrue("returned object should be a PredicatedMap",
  +            map instanceof PredicatedMap);
           try {
  -            map.put("Hi", new Integer(3));
  -            fail("Illegal value should raise IllegalArgument");
  -        } catch (IllegalArgumentException e) {
  -            // expected
  -        }
  -
  -        try {
  -            map.put(new Integer(3), "Hi");
  -            fail("Illegal key should raise IllegalArgument");
  -        } catch (IllegalArgumentException e) {
  -            // expected
  -        }
  -
  -        assertTrue(!map.containsKey(new Integer(3)));
  -        assertTrue(!map.containsValue(new Integer(3)));
  -
  -        Map map2 = new HashMap();
  -        map2.put("A", "a");
  -        map2.put("B", "b");
  -        map2.put("C", "c");
  -        map2.put("c", new Integer(3));
  -
  -        try {
  -            map.putAll(map2);
  -            fail("Illegal value should raise IllegalArgument");
  +            map = MapUtils.predicatedMap(null, p, p);
  +            fail("Expecting IllegalArgumentException for null map.");
           } catch (IllegalArgumentException e) {
               // expected
  -        }
  -
  -        map.put("E", "e");
  -        Iterator iterator = map.entrySet().iterator();
  -        try {
  -            Map.Entry entry = (Map.Entry)iterator.next();
  -            entry.setValue(new Integer(3));
  -            fail("Illegal value should raise IllegalArgument");
  -        } catch (IllegalArgumentException e) {
  -            // expected
  -        }
  +        }     
       }
   
       // Since a typed map is a predicated map, I copied the tests for predicated map
  @@ -187,23 +157,6 @@
               // expected
           }
       
  -    }
  -
  -    public BulkTest bulkTestPredicatedMap() {
  -        return new TestMap("") {
  -            public boolean useNullKey() {
  -                return false;
  -            }
  -
  -            public boolean useNullValue() {
  -                return false;
  -            }
  -
  -            public Map makeEmptyMap() {
  -                Predicate p = getPredicate();
  -                return MapUtils.predicatedMap(new HashMap(), p, p);
  -            }
  -        };
       }
       
       public BulkTest bulkTestTypedMap() {
  
  
  
  1.11      +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestAll.java
  
  Index: TestAll.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestAll.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestAll.java	12 Sep 2003 03:59:00 -0000	1.10
  +++ TestAll.java	13 Sep 2003 16:12:47 -0000	1.11
  @@ -104,6 +104,8 @@
           suite.addTest(TestPredicatedBuffer.suite());
           suite.addTest(TestPredicatedList.suite());
           suite.addTest(TestPredicatedSet.suite());
  +        suite.addTest(TestPredicatedMap.suite());
  +        suite.addTest(TestPredicatedSortedMap.suite());
           
           return suite;
       }
  
  
  
  1.1                  jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedMap.java
  
  Index: TestPredicatedMap.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedMap.java,v
1.1 2003/09/13 16:12:47 psteitz Exp $
   * ====================================================================
   *
   * 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.collections.decorators;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Set;
  import java.util.Iterator;
  
  import org.apache.commons.collections.TestMap;
  import org.apache.commons.collections.Predicate;
  import org.apache.commons.collections.PredicateUtils;
  /**
   * Extension of {@link TestMap} for exercising the 
   * {@link PredicatedMap} implementation.
   *
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/09/13 16:12:47 $
   * 
   * @author Phil Steitz
   */
  public class TestPredicatedMap extends TestMap{
      
      public TestPredicatedMap(String testName) {
          super(testName);
      }
      
      public static Test suite() {
          return new TestSuite(TestPredicatedMap.class);
      }
      
      public static void main(String args[]) {
          String[] testCaseName = { TestPredicatedMap.class.getName()};
          junit.textui.TestRunner.main(testCaseName);
      }
      
   //-------------------------------------------------------------------
      
      protected Predicate truePredicate = PredicateUtils.truePredicate();
      
      protected Map decorateMap(Map map, Predicate keyPredicate, 
          Predicate valuePredicate) {
          return PredicatedMap.decorate(map, keyPredicate, valuePredicate);
      }
      
      public Map makeEmptyMap() {
          return decorateMap(new HashMap(), truePredicate, truePredicate);
      }
      
  //--------------------------------------------------------------------   
      
       protected Predicate testPredicate =  
          new Predicate() {
              public boolean evaluate(Object o) {
                  return o instanceof String;
              }
          };      
      
      public Map makeTestMap() {
          return decorateMap(new HashMap(), testPredicate, testPredicate);
      }
      
      public void testEntrySet() {
          Map map = makeTestMap();
          assertTrue("returned entryset should not be null",
              map.entrySet() != null);
          map = decorateMap(new HashMap(), null, null);
          map.put("oneKey", "oneValue");
          assertTrue("returned entryset should contain one entry",
              map.entrySet().size() == 1); 
          map = decorateMap(map, null, null);
      }
      
      public void testPut() {
          Map map = makeTestMap();
          try {
              map.put("Hi", new Integer(3));
              fail("Illegal value should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
  
          try {
              map.put(new Integer(3), "Hi");
              fail("Illegal key should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
  
          assertTrue(!map.containsKey(new Integer(3)));
          assertTrue(!map.containsValue(new Integer(3)));
  
          Map map2 = new HashMap();
          map2.put("A", "a");
          map2.put("B", "b");
          map2.put("C", "c");
          map2.put("c", new Integer(3));
  
          try {
              map.putAll(map2);
              fail("Illegal value should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
  
          map.put("E", "e");
          Iterator iterator = map.entrySet().iterator();
          try {
              Map.Entry entry = (Map.Entry)iterator.next();
              entry.setValue(new Integer(3));
              fail("Illegal value should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
          
          map.put("F", "f");
          iterator = map.entrySet().iterator();
          Map.Entry entry = (Map.Entry)iterator.next();
          entry.setValue("x");
          
      }
          
  }
  
  
  1.1                  jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedMap.java
  
  Index: TestPredicatedSortedMap.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedMap.java,v
1.1 2003/09/13 16:12:47 psteitz Exp $
   * ====================================================================
   *
   * 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.collections.decorators;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  import java.util.Map;
  import java.util.Iterator;
  import java.util.Comparator;
  import java.util.HashMap;
  import java.util.SortedMap;
  import java.util.TreeMap;
  
  import org.apache.commons.collections.Predicate;
  
  /**
   * Extension of {@link TestPredicatedMap} for exercising the 
   * {@link PredicatedSortedMap} implementation.
   *
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/09/13 16:12:47 $
   * 
   * @author Phil Steitz
   */
  public class TestPredicatedSortedMap extends TestPredicatedMap{
      
      public TestPredicatedSortedMap(String testName) {
          super(testName);
      }
      
      public static Test suite() {
          return new TestSuite(TestPredicatedSortedMap.class);
      }
      
      public static void main(String args[]) {
          String[] testCaseName = { TestPredicatedSortedMap.class.getName()};
          junit.textui.TestRunner.main(testCaseName);
      }
      
   //-------------------------------------------------------------------    
      
      protected SortedMap decorateMap(SortedMap map, Predicate keyPredicate, 
          Predicate valuePredicate) {
          return PredicatedSortedMap.decorate(map, keyPredicate, valuePredicate);
      }
      
      public Map makeEmptyMap() {
          return decorateMap(new TreeMap(), truePredicate, truePredicate);
      }
     
      public Map makeTestMap() {
          return decorateMap(new TreeMap(), testPredicate, testPredicate);
      } 
      
      protected boolean useNullKey() {
          return false;
      }
      
  //--------------------------------------------------------------------   
      
      public SortedMap makeTestSortedMap() {
          return decorateMap(new TreeMap(), testPredicate, testPredicate);
      }
      
      public void testSortOrder() {
          SortedMap map = makeTestSortedMap();
          map.put("A",  "a");
          map.put("B", "b");
          try {
              map.put(null, "c");
              fail("Null key should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
          map.put("C", "c");
          try {
              map.put("D", null);
              fail("Null value should raise IllegalArgument");
          } catch (IllegalArgumentException e) {
              // expected
          }
          assertEquals("First key should be A", map.firstKey(), "A");
          assertEquals("Last key should be C", map.lastKey(), "C");
          assertEquals("First key in tail map should be B", 
              map.tailMap("B").firstKey(), "B");
          assertEquals("Last key in head map should be B", 
              map.headMap("C").lastKey(), "B");
          assertEquals("Last key in submap should be B",
             map.subMap("A","C").lastKey(), "B");
          
          Comparator c = map.comparator();
          assertTrue("natural order, so comparator should be null", 
              c == null);
      }
          
  }
  
  

Mime
View raw message