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.70 by jsr166, Sat May 13 22:49:01 2017 UTC vs.
Revision 1.78 by jsr166, Mon May 28 21:19:50 2018 UTC

# Line 59 | Line 59 | public class LinkedBlockingQueueTest ext
59       * Integers 0 ... n - 1.
60       */
61      private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62 <        LinkedBlockingQueue<Integer> q =
63 <            new LinkedBlockingQueue<Integer>(n);
62 >        LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue<>(n);
63          assertTrue(q.isEmpty());
64          for (int i = 0; i < n; i++)
65              assertTrue(q.offer(new Integer(i)));
# Line 314 | Line 313 | public class LinkedBlockingQueueTest ext
313                  pleaseTake.countDown();
314                  q.put(86);
315  
316 +                Thread.currentThread().interrupt();
317 +                try {
318 +                    q.put(99);
319 +                    shouldThrow();
320 +                } catch (InterruptedException success) {}
321 +                assertFalse(Thread.interrupted());
322 +
323                  pleaseInterrupt.countDown();
324                  try {
325                      q.put(99);
# Line 343 | Line 349 | public class LinkedBlockingQueueTest ext
349              public void realRun() throws InterruptedException {
350                  q.put(new Object());
351                  q.put(new Object());
352 +
353                  long startTime = System.nanoTime();
354                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
355                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
356 +
357 +                Thread.currentThread().interrupt();
358 +                try {
359 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
360 +                    shouldThrow();
361 +                } catch (InterruptedException success) {}
362 +                assertFalse(Thread.interrupted());
363 +
364                  pleaseInterrupt.countDown();
365                  try {
366                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
367                      shouldThrow();
368                  } catch (InterruptedException success) {}
369 +                assertFalse(Thread.interrupted());
370              }});
371  
372          await(pleaseInterrupt);
# Line 444 | Line 460 | public class LinkedBlockingQueueTest ext
460       */
461      public void testInterruptedTimedPoll() throws InterruptedException {
462          final BlockingQueue<Integer> q = populatedQueue(SIZE);
463 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
463 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
464          Thread t = newStartedThread(new CheckedRunnable() {
465              public void realRun() throws InterruptedException {
466                  long startTime = System.nanoTime();
467 <                for (int i = 0; i < SIZE; ++i) {
467 >                for (int i = 0; i < SIZE; i++)
468                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
469 <                }
470 <                aboutToWait.countDown();
469 >
470 >                Thread.currentThread().interrupt();
471 >                try {
472 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
473 >                    shouldThrow();
474 >                } catch (InterruptedException success) {}
475 >                assertFalse(Thread.interrupted());
476 >
477 >                pleaseInterrupt.countDown();
478                  try {
479                      q.poll(LONG_DELAY_MS, MILLISECONDS);
480                      shouldThrow();
481 <                } catch (InterruptedException success) {
482 <                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
483 <                }
481 >                } catch (InterruptedException success) {}
482 >                assertFalse(Thread.interrupted());
483 >
484 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
485              }});
486  
487 <        await(aboutToWait);
487 >        await(pleaseInterrupt);
488          assertThreadBlocks(t, Thread.State.TIMED_WAITING);
489          t.interrupt();
490          awaitTermination(t);
# Line 605 | Line 629 | public class LinkedBlockingQueueTest ext
629       */
630      public void testToArray() {
631          LinkedBlockingQueue q = populatedQueue(SIZE);
632 <        Object[] o = q.toArray();
633 <        for (int i = 0; i < o.length; i++)
634 <            assertSame(o[i], q.poll());
632 >        Object[] a = q.toArray();
633 >        assertSame(Object[].class, a.getClass());
634 >        for (Object o : a)
635 >            assertSame(o, q.poll());
636 >        assertTrue(q.isEmpty());
637      }
638  
639      /**
# Line 618 | Line 644 | public class LinkedBlockingQueueTest ext
644          Integer[] ints = new Integer[SIZE];
645          Integer[] array = q.toArray(ints);
646          assertSame(ints, array);
647 <        for (int i = 0; i < ints.length; i++)
648 <            assertSame(ints[i], q.poll());
647 >        for (Integer o : ints)
648 >            assertSame(o, q.poll());
649 >        assertTrue(q.isEmpty());
650      }
651  
652      /**
# Line 771 | Line 798 | public class LinkedBlockingQueueTest ext
798      }
799  
800      /**
801 <     * A deserialized serialized queue has same elements in same order
801 >     * A deserialized/reserialized queue has same elements in same order
802       */
803      public void testSerialization() throws Exception {
804          Queue x = populatedQueue(SIZE);

Diff Legend

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