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.91 by jsr166, Mon May 29 22:44:26 2017 UTC vs.
Revision 1.97 by jsr166, Mon Dec 16 21:16:08 2019 UTC

# Line 34 | Line 34 | public class ArrayBlockingQueueTest exte
34          class Implementation implements CollectionImplementation {
35              public Class<?> klazz() { return ArrayBlockingQueue.class; }
36              public Collection emptyCollection() {
37 <                boolean fair = ThreadLocalRandom.current().nextBoolean();
37 >                boolean fair = randomBoolean();
38                  return populatedQueue(0, SIZE, 2 * SIZE, fair);
39              }
40              public Object makeElement(int i) { return i; }
# Line 340 | Line 340 | public class ArrayBlockingQueueTest exte
340              }});
341  
342          await(pleaseInterrupt);
343 <        assertThreadBlocks(t, Thread.State.WAITING);
343 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
344          t.interrupt();
345          awaitTermination(t);
346          assertEquals(SIZE, q.size());
# Line 382 | Line 382 | public class ArrayBlockingQueueTest exte
382          assertEquals(0, q.take());
383  
384          await(pleaseInterrupt);
385 <        assertThreadBlocks(t, Thread.State.WAITING);
385 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
386          t.interrupt();
387          awaitTermination(t);
388          assertEquals(0, q.remainingCapacity());
# Line 404 | Line 404 | public class ArrayBlockingQueueTest exte
404  
405                  Thread.currentThread().interrupt();
406                  try {
407 <                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
407 >                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
408                      shouldThrow();
409                  } catch (InterruptedException success) {}
410                  assertFalse(Thread.interrupted());
411  
412                  pleaseInterrupt.countDown();
413                  try {
414 <                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
414 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
415                      shouldThrow();
416                  } catch (InterruptedException success) {}
417                  assertFalse(Thread.interrupted());
418              }});
419  
420          await(pleaseInterrupt);
421 <        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
421 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
422          t.interrupt();
423          awaitTermination(t);
424      }
# Line 459 | Line 459 | public class ArrayBlockingQueueTest exte
459              }});
460  
461          await(pleaseInterrupt);
462 <        assertThreadBlocks(t, Thread.State.WAITING);
462 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
463          t.interrupt();
464          awaitTermination(t);
465      }
# Line 512 | Line 512 | public class ArrayBlockingQueueTest exte
512          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
513          Thread t = newStartedThread(new CheckedRunnable() {
514              public void realRun() throws InterruptedException {
515 –                long startTime = System.nanoTime();
515                  for (int i = 0; i < SIZE; i++)
516                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
517  
518                  Thread.currentThread().interrupt();
519                  try {
520 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
520 >                    q.poll(randomTimeout(), randomTimeUnit());
521                      shouldThrow();
522                  } catch (InterruptedException success) {}
523                  assertFalse(Thread.interrupted());
524  
525                  pleaseInterrupt.countDown();
526                  try {
527 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
527 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
528                      shouldThrow();
529                  } catch (InterruptedException success) {}
530                  assertFalse(Thread.interrupted());
532 –
533 –                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
531              }});
532  
533          await(pleaseInterrupt);
534 <        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
534 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
535          t.interrupt();
536          awaitTermination(t);
537          checkEmpty(q);
# Line 691 | Line 688 | public class ArrayBlockingQueueTest exte
688              Integer x = (Integer) it.next();
689              assertEquals(s + i, (int) x);
690              for (Object[] a : as)
691 <                assertSame(a1[i], x);
691 >                assertSame(a[i], x);
692          }
693      }
694  
# Line 876 | Line 873 | public class ArrayBlockingQueueTest exte
873      }
874  
875      /**
876 <     * A deserialized serialized queue has same elements in same order
876 >     * A deserialized/reserialized queue has same elements in same order
877       */
878      public void testSerialization() throws Exception {
879          Queue x = populatedQueue(SIZE);

Diff Legend

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