commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject svn commit: r471166 - in /jakarta/commons/proper/collections/branches/collections_jdk5_branch: ./ src/java/org/apache/commons/collections/ src/java/org/apache/commons/collections/bag/ src/java/org/apache/commons/collections/buffer/ src/java/org/apache/...
Date Sat, 04 Nov 2006 11:33:24 GMT
Author: scolebourne
Date: Sat Nov  4 03:33:22 2006
New Revision: 471166

URL: http://svn.apache.org/viewvc?view=rev&rev=471166
Log:
Removed Typed* containers such as TypedList and TypedMap as generics now provides type safety

Removed:
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/TypedBag.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/TypedCollection.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/TypedList.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TypedMap.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TypedSortedMap.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/TypedSet.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/TypedSortedSet.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestTypedBag.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestTypedList.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestTypedSet.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
Modified:
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BagUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BufferUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CollectionUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ListUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SetUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBagUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMapUtils.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestAll.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestAll.java
    jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestAll.java

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt
Sat Nov  4 03:33:22 2006
@@ -35,6 +35,9 @@
 - Removed FastTreeSet
   - no direct replacement - use ConcurrentHashMap or synchronized TreeMap
 
+- Removed Typed* containers such as TypedList and TypedMap
+  - use generics for type safety, or Collections.checked*()
+
 
 Feedback
 --------

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BagUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BagUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BagUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BagUtils.java
Sat Nov  4 03:33:22 2006
@@ -24,8 +24,6 @@
 import org.apache.commons.collections.bag.TransformedBag;
 import org.apache.commons.collections.bag.TransformedSortedBag;
 import org.apache.commons.collections.bag.TreeBag;
-import org.apache.commons.collections.bag.TypedBag;
-import org.apache.commons.collections.bag.TypedSortedBag;
 import org.apache.commons.collections.bag.UnmodifiableBag;
 import org.apache.commons.collections.bag.UnmodifiableSortedBag;
 
@@ -122,19 +120,6 @@
     }
     
     /**
-     * Returns a typed bag backed by the given bag.
-     * <p>
-     * Only objects of the specified type can be added to the bag.
-     * 
-     * @param bag  the bag to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the bag
-     * @return a typed bag backed by the specified bag
-     */
-    public static Bag typedBag(Bag bag, Class type) {
-        return TypedBag.decorate(bag, type);
-    }
-    
-    /**
      * Returns a transformed bag backed by the given bag.
      * <p>
      * Each object is passed through the transformer as it is added to the
@@ -210,19 +195,6 @@
      */
     public static SortedBag predicatedSortedBag(SortedBag bag, Predicate predicate) {
         return PredicatedSortedBag.decorate(bag, predicate);
-    }
-    
-    /**
-     * Returns a typed sorted bag backed by the given bag.
-     * <p>
-     * Only objects of the specified type can be added to the bag.
-     * 
-     * @param bag  the bag to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the bag
-     * @return a typed bag backed by the specified bag
-     */
-    public static SortedBag typedSortedBag(SortedBag bag, Class type) {
-        return TypedSortedBag.decorate(bag, type);
     }
     
     /**

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BufferUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BufferUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BufferUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BufferUtils.java
Sat Nov  4 03:33:22 2006
@@ -17,12 +17,11 @@
 package org.apache.commons.collections;
 
 import org.apache.commons.collections.buffer.BlockingBuffer;
+import org.apache.commons.collections.buffer.BoundedBuffer;
 import org.apache.commons.collections.buffer.PredicatedBuffer;
 import org.apache.commons.collections.buffer.SynchronizedBuffer;
 import org.apache.commons.collections.buffer.TransformedBuffer;
-import org.apache.commons.collections.buffer.TypedBuffer;
 import org.apache.commons.collections.buffer.UnmodifiableBuffer;
-import org.apache.commons.collections.buffer.BoundedBuffer;
 
 /**
  * Provides utility methods and decorators for {@link Buffer} instances.
@@ -166,20 +165,6 @@
      */
     public static Buffer predicatedBuffer(Buffer buffer, Predicate predicate) {
         return PredicatedBuffer.decorate(buffer, predicate);
-    }
-
-    /**
-     * Returns a typed buffer backed by the given buffer.
-     * <p>
-     * Only elements of the specified type can be added to the buffer.
-     *
-     * @param buffer  the buffer to predicate, must not be null
-     * @param type  the type to allow into the buffer, must not be null
-     * @return a typed buffer
-     * @throws IllegalArgumentException  if the buffer or type is null
-     */
-    public static Buffer typedBuffer(Buffer buffer, Class type) {
-        return TypedBuffer.decorate(buffer, type);
     }
 
     /**

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CollectionUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CollectionUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CollectionUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CollectionUtils.java
Sat Nov  4 03:33:22 2006
@@ -31,7 +31,6 @@
 import org.apache.commons.collections.collection.PredicatedCollection;
 import org.apache.commons.collections.collection.SynchronizedCollection;
 import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.collection.TypedCollection;
 import org.apache.commons.collections.collection.UnmodifiableBoundedCollection;
 import org.apache.commons.collections.collection.UnmodifiableCollection;
 
@@ -1072,19 +1071,6 @@
         return PredicatedCollection.decorate(collection, predicate);
     }
 
-    /**
-     * Returns a typed collection backed by the given collection.
-     * <p>
-     * Only objects of the specified type can be added to the collection.
-     * 
-     * @param collection  the collection to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the collection
-     * @return a typed collection backed by the specified collection
-     */
-    public static Collection typedCollection(Collection collection, Class type) {
-        return TypedCollection.decorate(collection, type);
-    }
-    
     /**
      * Returns a transformed bag backed by the given collection.
      * <p>

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ListUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ListUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ListUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ListUtils.java
Sat Nov  4 03:33:22 2006
@@ -27,7 +27,6 @@
 import org.apache.commons.collections.list.PredicatedList;
 import org.apache.commons.collections.list.SynchronizedList;
 import org.apache.commons.collections.list.TransformedList;
-import org.apache.commons.collections.list.TypedList;
 import org.apache.commons.collections.list.UnmodifiableList;
 
 /**
@@ -331,19 +330,6 @@
         return PredicatedList.decorate(list, predicate);
     }
 
-    /**
-     * Returns a typed list backed by the given list.
-     * <p>
-     * Only objects of the specified type can be added to the list.
-     * 
-     * @param list  the list to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the list
-     * @return a typed list backed by the specified list
-     */
-    public static List typedList(List list, Class type) {
-        return TypedList.decorate(list, type);
-    }
-    
     /**
      * Returns a transformed list backed by the given list.
      * <p>

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
Sat Nov  4 03:33:22 2006
@@ -39,8 +39,6 @@
 import org.apache.commons.collections.map.PredicatedSortedMap;
 import org.apache.commons.collections.map.TransformedMap;
 import org.apache.commons.collections.map.TransformedSortedMap;
-import org.apache.commons.collections.map.TypedMap;
-import org.apache.commons.collections.map.TypedSortedMap;
 import org.apache.commons.collections.map.UnmodifiableMap;
 import org.apache.commons.collections.map.UnmodifiableSortedMap;
 
@@ -1274,21 +1272,6 @@
     }
 
     /**
-     * Returns a typed map backed by the given map.
-     * <p>
-     * Only keys and values of the specified types can be added to the map.
-     * 
-     * @param map  the map to limit to a specific type, must not be null
-     * @param keyType  the type of keys which may be added to the map, must not be null
-     * @param valueType  the type of values which may be added to the map, must not be null
-     * @return a typed map backed by the specified map
-     * @throws IllegalArgumentException  if the Map or Class is null
-     */
-    public static Map typedMap(Map map, Class keyType, Class valueType) {
-        return TypedMap.decorate(map, keyType, valueType);
-    }
-    
-    /**
      * Returns a transformed map backed by the given map.
      * <p>
      * This method returns a new map (decorating the specified map) that
@@ -1517,20 +1500,6 @@
         return PredicatedSortedMap.decorate(map, keyPred, valuePred);
     }
 
-    /**
-     * Returns a typed sorted map backed by the given map.
-     * <p>
-     * Only keys and values of the specified types can be added to the map.
-     * 
-     * @param map  the map to limit to a specific type, must not be null
-     * @param keyType  the type of keys which may be added to the map, must not be null
-     * @param valueType  the type of values which may be added to the map, must not be null
-     * @return a typed map backed by the specified map
-     */
-    public static SortedMap typedSortedMap(SortedMap map, Class keyType, Class valueType)
{
-        return TypedSortedMap.decorate(map, keyType, valueType);
-    }
-    
     /**
      * Returns a transformed sorted map backed by the given map.
      * <p>

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SetUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SetUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SetUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SetUtils.java
Sat Nov  4 03:33:22 2006
@@ -30,8 +30,6 @@
 import org.apache.commons.collections.set.SynchronizedSortedSet;
 import org.apache.commons.collections.set.TransformedSet;
 import org.apache.commons.collections.set.TransformedSortedSet;
-import org.apache.commons.collections.set.TypedSet;
-import org.apache.commons.collections.set.TypedSortedSet;
 import org.apache.commons.collections.set.UnmodifiableSet;
 import org.apache.commons.collections.set.UnmodifiableSortedSet;
 
@@ -194,19 +192,6 @@
     }
 
     /**
-     * Returns a typed set backed by the given set.
-     * <p>
-     * Only objects of the specified type can be added to the set.
-     * 
-     * @param set  the set to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the set
-     * @return a typed set backed by the specified set
-     */
-    public static Set typedSet(Set set, Class type) {
-        return TypedSet.decorate(set, type);
-    }
-    
-    /**
      * Returns a transformed set backed by the given set.
      * <p>
      * Each object is passed through the transformer as it is added to the
@@ -294,19 +279,6 @@
         return PredicatedSortedSet.decorate(set, predicate);
     }
 
-    /**
-     * Returns a typed sorted set backed by the given set.
-     * <p>
-     * Only objects of the specified type can be added to the set.
-     * 
-     * @param set  the set to limit to a specific type, must not be null
-     * @param type  the type of objects which may be added to the set
-     * @return a typed set backed by the specified set
-     */
-    public static SortedSet typedSortedSet(SortedSet set, Class type) {
-        return TypedSortedSet.decorate(set, type);
-    }
-    
     /**
      * Returns a transformed sorted set backed by the given set.
      * <p>

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBagUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBagUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBagUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBagUtils.java
Sat Nov  4 03:33:22 2006
@@ -97,24 +97,6 @@
         }  
     }
     
-    public void testTypedBag() {
-        Bag bag = BagUtils.typedBag(new HashBag(), stringClass);      
-        assertTrue("Returned object should be a TypedBag.",
-            bag instanceof PredicatedBag);
-        try {
-            bag = BagUtils.typedBag(null, stringClass);
-            fail("Expecting IllegalArgumentException for null bag.");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        } 
-        try {
-            bag = BagUtils.typedBag(new HashBag(), null);
-            fail("Expecting IllegalArgumentException for null type.");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }  
-    }
-    
      public void testTransformedBag() {
         Bag bag = BagUtils.transformedBag(new HashBag(), nopTransformer);      
         assertTrue("Returned object should be an TransformedBag.",
@@ -170,24 +152,6 @@
         try {
             bag = BagUtils.predicatedSortedBag(new TreeBag(), null);
             fail("Expecting IllegalArgumentException for null predicate.");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }  
-    }
-    
-    public void testTypedSortedBag() {
-        Bag bag = BagUtils.typedSortedBag(new TreeBag(), stringClass);      
-        assertTrue("Returned object should be a TypedSortedBag.",
-            bag instanceof PredicatedSortedBag);
-        try {
-            bag = BagUtils.typedSortedBag(null, stringClass);
-            fail("Expecting IllegalArgumentException for null bag.");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        } 
-        try {
-            bag = BagUtils.typedSortedBag(new TreeBag(), null);
-            fail("Expecting IllegalArgumentException for null type.");
         } catch (IllegalArgumentException ex) {
             // expected
         }  

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
Sat Nov  4 03:33:22 2006
@@ -36,7 +36,6 @@
 
 import org.apache.commons.collections.bag.HashBag;
 import org.apache.commons.collections.buffer.BoundedFifoBuffer;
-import org.apache.commons.collections.collection.AbstractTestCollection;
 import org.apache.commons.collections.collection.PredicatedCollection;
 import org.apache.commons.collections.collection.SynchronizedCollection;
 import org.apache.commons.collections.collection.TransformedCollection;
@@ -998,43 +997,6 @@
         
    
 
-    public BulkTest bulkTestTypedCollection() {
-        return new TestTypedCollection("") {
-            public Collection typedCollection() {
-                return CollectionUtils.typedCollection(
-                    new ArrayList(),
-                    super.getType());
-            }
- 
-            public BulkTest bulkTestAll() {
-                return new AbstractTestCollection("") {
-                    public Collection makeCollection() {
-                        return typedCollection();
-                    }
- 
-                    public Collection makeConfirmedCollection() {
-                        return new ArrayList();
-                    }
- 
-                    public Collection makeConfirmedFullCollection() {
-                        ArrayList list = new ArrayList();
-                        list.addAll(java.util.Arrays.asList(getFullElements()));
-                        return list;
-                    }
- 
-                    public Object[] getFullElements() {
-                        return getFullNonNullStringElements();
-                    }
- 
-                    public Object[] getOtherElements() {
-                        return getOtherNonNullStringElements();
-                    }
- 
-                };
-            }
-        };
-    }
-    
     public void testIsFull() {
         Set set = new HashSet();
         set.add("1");

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMapUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMapUtils.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMapUtils.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMapUtils.java
Sat Nov  4 03:33:22 2006
@@ -33,7 +33,6 @@
 import org.apache.commons.collections.keyvalue.DefaultMapEntry;
 import org.apache.commons.collections.map.LazyMap;
 import org.apache.commons.collections.map.PredicatedMap;
-import org.apache.commons.collections.map.TestPredicatedMap;
 
 /**
  * Tests for MapUtils.
@@ -76,68 +75,6 @@
         } catch (IllegalArgumentException e) {
             // expected
         }
-    }
-
-    // Since a typed map is a predicated map, I copied the tests for predicated map
-    public void testTypedMapIllegalPut() {
-        final Map map = MapUtils.typedMap(new HashMap(), String.class, String.class);
-
-        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
-        }
-
-    }
-
-    public BulkTest bulkTestTypedMap() {
-        return new TestPredicatedMap("") {
-            public boolean isAllowNullKey() {
-                return false;
-            }
-
-            public boolean isAllowNullValue() {
-                return false;
-            }
-
-            public Map makeEmptyMap() {
-                return MapUtils.typedMap(new HashMap(), String.class, String.class);
-            }
-        };
     }
 
     public void testLazyMapFactory() {

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestAll.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestAll.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestAll.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/bag/TestAll.java
Sat Nov  4 03:33:22 2006
@@ -48,8 +48,6 @@
         suite.addTest(TestTransformedBag.suite());
         suite.addTest(TestTransformedSortedBag.suite());
         suite.addTest(TestTreeBag.suite());
-        suite.addTest(TestTypedBag.suite());
-        suite.addTest(TestTypedSortedBag.suite());
         
         return suite;
     }

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestAll.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestAll.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestAll.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestAll.java
Sat Nov  4 03:33:22 2006
@@ -52,7 +52,6 @@
         suite.addTest(TestSetUniqueList.suite());
         suite.addTest(TestSynchronizedList.suite());
         suite.addTest(TestTransformedList.suite());
-        suite.addTest(TestTypedList.suite());
         suite.addTest(TestUnmodifiableList.suite());
         
         return suite;

Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestAll.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestAll.java?view=diff&rev=471166&r1=471165&r2=471166
==============================================================================
--- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestAll.java
(original)
+++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/set/TestAll.java
Sat Nov  4 03:33:22 2006
@@ -53,8 +53,6 @@
         suite.addTest(TestSynchronizedSortedSet.suite());
         suite.addTest(TestTransformedSet.suite());
         suite.addTest(TestTransformedSortedSet.suite());
-        suite.addTest(TestTypedSet.suite());
-        suite.addTest(TestTypedSortedSet.suite());
         suite.addTest(TestUnmodifiableSet.suite());
         suite.addTest(TestUnmodifiableSortedSet.suite());
         



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message