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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.80 by jsr166, Sun Nov 6 04:16:52 2016 UTC vs.
Revision 1.84 by jsr166, Sat May 13 22:17:12 2017 UTC

# Line 340 | Line 340 | public class ArrayBlockingQueueTest exte
340              }});
341  
342          await(pleaseInterrupt);
343 <        assertThreadStaysAlive(t);
343 >        assertThreadBlocks(t, Thread.State.WAITING);
344          t.interrupt();
345          awaitTermination(t);
346          assertEquals(SIZE, q.size());
# Line 375 | Line 375 | public class ArrayBlockingQueueTest exte
375          assertEquals(0, q.take());
376  
377          await(pleaseInterrupt);
378 <        assertThreadStaysAlive(t);
378 >        assertThreadBlocks(t, Thread.State.WAITING);
379          t.interrupt();
380          awaitTermination(t);
381          assertEquals(0, q.remainingCapacity());
# Line 402 | Line 402 | public class ArrayBlockingQueueTest exte
402              }});
403  
404          await(pleaseInterrupt);
405 <        assertThreadStaysAlive(t);
405 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
406          t.interrupt();
407          awaitTermination(t);
408      }
# Line 425 | Line 425 | public class ArrayBlockingQueueTest exte
425          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426          Thread t = newStartedThread(new CheckedRunnable() {
427              public void realRun() throws InterruptedException {
428 <                for (int i = 0; i < SIZE; ++i) {
429 <                    assertEquals(i, q.take());
430 <                }
428 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
429  
430                  Thread.currentThread().interrupt();
431                  try {
# Line 445 | Line 443 | public class ArrayBlockingQueueTest exte
443              }});
444  
445          await(pleaseInterrupt);
446 <        assertThreadStaysAlive(t);
446 >        assertThreadBlocks(t, Thread.State.WAITING);
447          t.interrupt();
448          awaitTermination(t);
449      }
# Line 579 | Line 577 | public class ArrayBlockingQueueTest exte
577       * clear removes all elements
578       */
579      public void testClear() {
580 <        ArrayBlockingQueue q = populatedQueue(SIZE);
580 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
581 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
582 >        int capacity = size + q.remainingCapacity();
583          q.clear();
584          assertTrue(q.isEmpty());
585          assertEquals(0, q.size());
586 <        assertEquals(SIZE, q.remainingCapacity());
586 >        assertEquals(capacity, q.remainingCapacity());
587          q.add(one);
588          assertFalse(q.isEmpty());
589          assertTrue(q.contains(one));

Diff Legend

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