ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.51 by jsr166, Sat Nov 26 05:42:14 2011 UTC vs.
Revision 1.59 by jsr166, Sat Apr 25 04:55:31 2015 UTC

# Line 5 | Line 5
5   * Other contributors include John Vint
6   */
7  
8 < import junit.framework.*;
9 < import java.util.Arrays;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11 + import java.util.Arrays;
12   import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
# Line 18 | Line 19 | import java.util.concurrent.CountDownLat
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21   import java.util.concurrent.LinkedTransferQueue;
22 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
23 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
22 >
23 > import junit.framework.Test;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 31 | Line 32 | public class LinkedTransferQueueTest ext
32      }
33  
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
# Line 114 | Line 115 | public class LinkedTransferQueueTest ext
115       * remainingCapacity() always returns Integer.MAX_VALUE
116       */
117      public void testRemainingCapacity() {
118 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
118 >        BlockingQueue q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
121              assertEquals(SIZE - i, q.size());
122 <            q.remove();
122 >            assertEquals(i, q.remove());
123          }
124          for (int i = 0; i < SIZE; ++i) {
125              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
126              assertEquals(i, q.size());
127 <            q.add(i);
127 >            assertTrue(q.add(i));
128          }
129      }
130  
# Line 499 | Line 500 | public class LinkedTransferQueueTest ext
500      public void testIterator() throws InterruptedException {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          Iterator it = q.iterator();
503 <        int i = 0;
504 <        while (it.hasNext()) {
505 <            assertEquals(it.next(), i++);
505 <        }
503 >        int i;
504 >        for (i = 0; it.hasNext(); i++)
505 >            assertTrue(q.contains(it.next()));
506          assertEquals(i, SIZE);
507 +        assertIteratorExhausted(it);
508 +
509 +        it = q.iterator();
510 +        for (i = 0; it.hasNext(); i++)
511 +            assertEquals(it.next(), q.take());
512 +        assertEquals(i, SIZE);
513 +        assertIteratorExhausted(it);
514 +    }
515 +
516 +    /**
517 +     * iterator of empty collection has no elements
518 +     */
519 +    public void testEmptyIterator() {
520 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
521      }
522  
523      /**
# Line 625 | Line 639 | public class LinkedTransferQueueTest ext
639          Queue x = populatedQueue(SIZE);
640          Queue y = serialClone(x);
641  
642 <        assertTrue(x != y);
642 >        assertNotSame(y, x);
643          assertEquals(x.size(), y.size());
644          assertEquals(x.toString(), y.toString());
645          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 696 | Line 710 | public class LinkedTransferQueueTest ext
710              assertEquals(SIZE - k, q.size());
711              for (int j = 0; j < k; ++j)
712                  assertEquals(j, l.get(j));
713 <            while (q.poll() != null)
700 <                ;
713 >            do {} while (q.poll() != null);
714          }
715      }
716  
# Line 1013 | Line 1026 | public class LinkedTransferQueueTest ext
1026          assertFalse(q.isEmpty());
1027          return q;
1028      }
1029 +
1030 +    /**
1031 +     * remove(null), contains(null) always return false
1032 +     */
1033 +    public void testNeverContainsNull() {
1034 +        Collection<?>[] qs = {
1035 +            new LinkedTransferQueue<Object>(),
1036 +            populatedQueue(2),
1037 +        };
1038 +
1039 +        for (Collection<?> q : qs) {
1040 +            assertFalse(q.contains(null));
1041 +            assertFalse(q.remove(null));
1042 +        }
1043 +    }
1044   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines