[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/collection/Transformed...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan 19 15:40:47 2012
New Revision: 215

URL: http://svn.shibboleth.net/view/utilities?rev=215&view=rev
Log:
rename addToDelegate putToDelegate.
tests for the TransformedInputMap (with some refactoring)

Added:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java   (contents, props changed)
      - copied, changed from r213, java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTestSupport.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java   (contents, props changed)
      - copied, changed from r212, java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/ListTestSupport.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java   (with props)
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputMapTest.java   (with props)
Removed:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTestSupport.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/ListTestSupport.java
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputListTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputSetTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java?rev=215&r1=214&r2=215&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java Thu Jan 19 15:40:47 2012
@@ -98,7 +98,7 @@
      * @param key key added to the delegate
      * @param value value added to the delegate
      */
-    protected void addToDelegate(K key, V value) {
+    protected void putToDelegate(K key, V value) {
         delegate.put(key, value);
     }
 }

Copied: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java (from r213, java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTestSupport.java)
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java?p2=java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java&p1=java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTestSupport.java&r1=213&r2=215&rev=215&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTestSupport.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java Thu Jan 19 15:40:47 2012
@@ -33,10 +33,10 @@
 import com.google.common.base.Predicates;
 
 /**
- * Helper class for testing {@link TransformedInputList} and {@link TransformedInputSet}
+ * Generic {@link Collection} tester
  * 
  */
-public class CollectionTestSupport {
+public class CollectionTest {
 
     private final static String STRING_1 = "StringOne";
 
@@ -47,14 +47,17 @@
     public static final Function<String, Optional<? extends String>> nullRemoveFunction =
             new TransformAndCheckFunction(Functions.identity(), Predicates.notNull(), false);
 
+    public static final Function<String, Optional<? extends String>> upcaseNotNull = new TransformAndCheckFunction(
+            new UpcaseFunction(), Predicates.notNull(), false);
+
     @Test public void verifyTests() {
-        CollectionTestSupport.testSimpleCollection(new ArrayList<String>(), true);
-        CollectionTestSupport.testArrayCollection(new ArrayList<String>(), new ArrayList<String>());
-        CollectionTestSupport.testIteratorCollection(new LazyList<String>(), new ArrayList<String>());
-
-        CollectionTestSupport.testSimpleCollection(new HashSet<String>(), false);
-        CollectionTestSupport.testArrayCollection(new HashSet<String>(), new HashSet<String>());

[... 349 lines stripped ...]