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

Comparing jsr166/src/test/tck/BlockingQueueTest.java (file contents):
Revision 1.21 by jsr166, Wed Jan 10 14:41:52 2018 UTC vs.
Revision 1.24 by jsr166, Thu Sep 5 21:30:59 2019 UTC

# Line 134 | Line 134 | public abstract class BlockingQueueTest
134      public void testToArray_NullArray() {
135          final Collection q = emptyCollection();
136          try {
137 <            q.toArray(null);
137 >            q.toArray((Object[])null);
138              shouldThrow();
139          } catch (NullPointerException success) {}
140      }
# Line 226 | Line 226 | public abstract class BlockingQueueTest
226  
227                  Thread.currentThread().interrupt();
228                  try {
229 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
229 >                    q.poll(randomTimeout(), randomTimeUnit());
230                      shouldThrow();
231                  } catch (InterruptedException success) {}
232                  assertFalse(Thread.interrupted());
# Line 247 | Line 247 | public abstract class BlockingQueueTest
247          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
248  
249          barrier.await();
250 <        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
250 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
251          t.interrupt();
252          awaitTermination(t);
253      }
# Line 269 | Line 269 | public abstract class BlockingQueueTest
269              }});
270  
271          await(threadStarted);
272 <        assertThreadBlocks(t, Thread.State.WAITING);
272 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
273          t.interrupt();
274          awaitTermination(t);
275      }
# Line 298 | Line 298 | public abstract class BlockingQueueTest
298       */
299      public void testTimedPollFromEmptyBlocksInterruptibly() {
300          final BlockingQueue q = emptyCollection();
301 <        final CountDownLatch threadStarted = new CountDownLatch(1);
301 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
302          Thread t = newStartedThread(new CheckedRunnable() {
303              public void realRun() {
304 <                threadStarted.countDown();
304 >                pleaseInterrupt.countDown();
305                  try {
306 <                    q.poll(2 * LONG_DELAY_MS, MILLISECONDS);
306 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
307                      shouldThrow();
308                  } catch (InterruptedException success) {}
309                  assertFalse(Thread.interrupted());
310              }});
311  
312 <        await(threadStarted);
313 <        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
312 >        await(pleaseInterrupt);
313 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
314          t.interrupt();
315          awaitTermination(t);
316      }
# Line 325 | Line 325 | public abstract class BlockingQueueTest
325              public void realRun() {
326                  Thread.currentThread().interrupt();
327                  try {
328 <                    q.poll(2 * LONG_DELAY_MS, MILLISECONDS);
328 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
329                      shouldThrow();
330                  } catch (InterruptedException success) {}
331                  assertFalse(Thread.interrupted());

Diff Legend

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