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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.63 by jsr166, Sat Aug 6 17:02:49 2016 UTC vs.
Revision 1.67 by jsr166, Sat May 13 21:43:51 2017 UTC

# Line 41 | Line 41 | public class LinkedBlockingQueueTest ext
41      }
42  
43      public static Test suite() {
44 +        class Implementation implements CollectionImplementation {
45 +            public Class<?> klazz() { return LinkedBlockingQueue.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingQueueTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58       * Returns a new queue of given size containing consecutive
59 <     * Integers 0 ... n.
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingQueue<Integer> populatedQueue(int n) {
61 >    private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62          LinkedBlockingQueue<Integer> q =
63              new LinkedBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
# Line 59 | Line 67 | public class LinkedBlockingQueueTest ext
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peek());
71          return q;
72      }
73  
# Line 368 | Line 377 | public class LinkedBlockingQueueTest ext
377          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
378          Thread t = newStartedThread(new CheckedRunnable() {
379              public void realRun() throws InterruptedException {
380 <                for (int i = 0; i < SIZE; ++i) {
372 <                    assertEquals(i, q.take());
373 <                }
380 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381  
382                  Thread.currentThread().interrupt();
383                  try {
# Line 388 | Line 395 | public class LinkedBlockingQueueTest ext
395              }});
396  
397          await(pleaseInterrupt);
398 <        assertThreadStaysAlive(t);
398 >        assertThreadBlocks(t, Thread.State.WAITING);
399          t.interrupt();
400          awaitTermination(t);
401      }

Diff Legend

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