svn commit: r1468584 - /commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java

[tn...@apache.org]

Author: tn
Date: Tue Apr 16 20:03:43 2013
New Revision: 1468584

URL: http://svn.apache.org/r1468584
Log:
[COLLECTION-432] update bounded collection test.

Modified:
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java?rev=1468584&r1=1468583&r2=1468584&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java Tue Apr 16 20:03:43 2013
@@ -27,13 +27,13 @@ import static org.junit.Assert.fail;
 import java.util.*;
 
 import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.buffer.BoundedFifoBuffer;
 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.UnmodifiableCollection;
 import org.apache.commons.collections.functors.DefaultEquator;
 import org.apache.commons.collections.functors.Equator;
+import org.apache.commons.collections.queue.CircularFifoQueue;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -1211,19 +1211,12 @@ public class CollectionUtilsTest extends
         }
         assertFalse(CollectionUtils.isFull(set));
 
-        final BoundedFifoBuffer<String> buf = new BoundedFifoBuffer<String>(set);
-        assertEquals(true, CollectionUtils.isFull(buf));
+        final CircularFifoQueue<String> buf = new CircularFifoQueue<String>(set);
+        assertEquals(false, CollectionUtils.isFull(buf));
         buf.remove("2");
         assertFalse(CollectionUtils.isFull(buf));
         buf.add("2");
-        assertEquals(true, CollectionUtils.isFull(buf));
-
-        final Buffer<String> buf2 = BufferUtils.synchronizedBuffer(buf);
-        assertEquals(true, CollectionUtils.isFull(buf2));
-        buf2.remove("2");
-        assertFalse(CollectionUtils.isFull(buf2));
-        buf2.add("2");
-        assertEquals(true, CollectionUtils.isFull(buf2));
+        assertEquals(false, CollectionUtils.isFull(buf));
     }
 
     @Test
@@ -1245,19 +1238,12 @@ public class CollectionUtilsTest extends
         }
         assertEquals(-1, CollectionUtils.maxSize(set));
 
-        final Buffer<String> buf = new BoundedFifoBuffer<String>(set);
+        final Queue<String> buf = new CircularFifoQueue<String>(set);
         assertEquals(3, CollectionUtils.maxSize(buf));
         buf.remove("2");
         assertEquals(3, CollectionUtils.maxSize(buf));
         buf.add("2");
         assertEquals(3, CollectionUtils.maxSize(buf));
-
-        final Buffer<String> buf2 = BufferUtils.synchronizedBuffer(buf);
-        assertEquals(3, CollectionUtils.maxSize(buf2));
-        buf2.remove("2");
-        assertEquals(3, CollectionUtils.maxSize(buf2));
-        buf2.add("2");
-        assertEquals(3, CollectionUtils.maxSize(buf2));
     }
 
     @Test