[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 14:47:50 2012
New Revision: 213

URL: http://svn.shibboleth.net/view/utilities?rev=213&view=rev
Log:
Extra tests for TransformedList (test the transform bit as well).  And a bug fix.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java
    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/TransformedInputListTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java?rev=213&r1=212&r2=213&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java Thu Jan 19 14:47:50 2012
@@ -173,7 +173,7 @@
             Optional<? extends E> processedElement = transform.apply(element);
 
             if (processedElement.isPresent()) {
-                delegate().set(element);
+                delegate().set(processedElement.get());
             }
         }
 

Modified: 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/CollectionTestSupport.java?rev=213&r1=212&r2=213&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/CollectionTestSupport.java Thu Jan 19 14:47:50 2012
@@ -239,4 +239,16 @@
 
     }
 
+    public static class UpcaseFunction implements Function<String, String>
+    {
+
+        /** {@inheritDoc} */
+        public String apply(String input) {
+            if (null == input) {
+                return null;
+            }
+            return input.toUpperCase();
+        }
+        
+    }
 }

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputListTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputListTest.java?rev=213&r1=212&r2=213&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputListTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/TransformedInputListTest.java Thu Jan 19 14:47:50 2012
@@ -19,13 +19,15 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 import java.util.ListIterator;
+
+import net.shibboleth.utilities.java.support.logic.TransformAndCheckFunction;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+
+import com.google.common.base.Predicates;
 
 /**
  * Tests for {@link TransformedInputList}. We extend the basic tests done for the LazySet.
@@ -39,38 +41,26 @@
             CollectionTestSupport.nullRemoveFunction);
     }
 
-    /**
-     * Test the test method with a known good List and then with a LazyList
-     */
     @Test public void testSimple() {
         CollectionTestSupport.testSimpleCollection(testList, true);
     }
 
-    /**
-     * Test The array function.
-     */
     @Test public void testArray() {
         CollectionTestSupport.testArrayCollection(testList, new ArrayList<String>());
     }
 
-    /**
-     * Test the iterator part of a collection.
-     */
     @Test public void testIterator() {
         CollectionTestSupport.testIteratorCollection(testList, new ArrayList<String>());
     }
 
-    /**
-     * Test those things that distinguish the {@link List} API from the {@link Collection} one.
-     */
     @Test public void testListFunctions() {
         ListTestSupport.testListFunctions(testList);
     }
 
     /**
-     * Test the transform bits
+     * Test the predicate bits
      */
-    @Test public void testTransforms() {
+    @Test public void testPredicate() {
         Assert.assertTrue(testList.isEmpty(), "Initial state");
         testList.add(null);
         Assert.assertTrue(testList.isEmpty(), "Add null");
@@ -125,4 +115,42 @@
         testList.remove(1);
         Assert.assertEquals(testList.get(1), "NEWone", "allAll test2");
     }
+    
+    @Test public void testTransform() {
+        testList = new TransformedInputList<String>(new ArrayList<String>(),

[... 37 lines stripped ...]