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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.73 by jsr166, Sat May 13 22:38:09 2017 UTC vs.
Revision 1.83 by jsr166, Mon May 28 21:19:50 2018 UTC

# Line 442 | Line 442 | public class LinkedBlockingDequeTest ext
442      }
443  
444      /**
445 <     * push succeeds if not full; throws ISE if full
445 >     * push succeeds if not full; throws IllegalStateException if full
446       */
447      public void testPush() {
448          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
# Line 492 | Line 492 | public class LinkedBlockingDequeTest ext
492      }
493  
494      /**
495 <     * add succeeds if not full; throws ISE if full
495 >     * add succeeds if not full; throws IllegalStateException if full
496       */
497      public void testAdd() {
498          LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
# Line 506 | Line 506 | public class LinkedBlockingDequeTest ext
506      }
507  
508      /**
509 <     * addAll(this) throws IAE
509 >     * addAll(this) throws IllegalArgumentException
510       */
511      public void testAddAllSelf() {
512          LinkedBlockingDeque q = populatedDeque(SIZE);
# Line 626 | Line 626 | public class LinkedBlockingDequeTest ext
626                  pleaseTake.countDown();
627                  q.put(86);
628  
629 +                Thread.currentThread().interrupt();
630 +                try {
631 +                    q.put(99);
632 +                    shouldThrow();
633 +                } catch (InterruptedException success) {}
634 +                assertFalse(Thread.interrupted());
635 +
636                  pleaseInterrupt.countDown();
637                  try {
638                      q.put(99);
# Line 648 | Line 655 | public class LinkedBlockingDequeTest ext
655      /**
656       * timed offer times out if full and elements not taken
657       */
658 <    public void testTimedOffer() throws InterruptedException {
658 >    public void testTimedOffer() {
659          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
660          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661          Thread t = newStartedThread(new CheckedRunnable() {
# Line 658 | Line 665 | public class LinkedBlockingDequeTest ext
665                  long startTime = System.nanoTime();
666                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
667                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
668 +
669 +                Thread.currentThread().interrupt();
670 +                try {
671 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
672 +                    shouldThrow();
673 +                } catch (InterruptedException success) {}
674 +                assertFalse(Thread.interrupted());
675 +
676                  pleaseInterrupt.countDown();
677                  try {
678                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679                      shouldThrow();
680                  } catch (InterruptedException success) {}
681 +                assertFalse(Thread.interrupted());
682              }});
683  
684          await(pleaseInterrupt);
# Line 756 | Line 772 | public class LinkedBlockingDequeTest ext
772       */
773      public void testInterruptedTimedPoll() throws InterruptedException {
774          final BlockingQueue<Integer> q = populatedDeque(SIZE);
775 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
775 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
776          Thread t = newStartedThread(new CheckedRunnable() {
777              public void realRun() throws InterruptedException {
778                  long startTime = System.nanoTime();
779 <                for (int i = 0; i < SIZE; ++i) {
779 >                for (int i = 0; i < SIZE; i++)
780                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
781 <                }
782 <                aboutToWait.countDown();
781 >
782 >                Thread.currentThread().interrupt();
783 >                try {
784 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
785 >                    shouldThrow();
786 >                } catch (InterruptedException success) {}
787 >                assertFalse(Thread.interrupted());
788 >
789 >                pleaseInterrupt.countDown();
790                  try {
791                      q.poll(LONG_DELAY_MS, MILLISECONDS);
792                      shouldThrow();
793 <                } catch (InterruptedException success) {
794 <                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
795 <                }
793 >                } catch (InterruptedException success) {}
794 >                assertFalse(Thread.interrupted());
795 >
796 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
797              }});
798  
799 <        await(aboutToWait);
800 <        waitForThreadToEnterWaitState(t);
799 >        await(pleaseInterrupt);
800 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
801          t.interrupt();
802          awaitTermination(t);
803          checkEmpty(q);
# Line 876 | Line 900 | public class LinkedBlockingDequeTest ext
900      /**
901       * timed offerFirst times out if full and elements not taken
902       */
903 <    public void testTimedOfferFirst() throws InterruptedException {
903 >    public void testTimedOfferFirst() {
904          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
905          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
906          Thread t = newStartedThread(new CheckedRunnable() {
# Line 886 | Line 910 | public class LinkedBlockingDequeTest ext
910                  long startTime = System.nanoTime();
911                  assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
912                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
913 +
914 +                Thread.currentThread().interrupt();
915 +                try {
916 +                    q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
917 +                    shouldThrow();
918 +                } catch (InterruptedException success) {}
919 +                assertFalse(Thread.interrupted());
920 +
921                  pleaseInterrupt.countDown();
922                  try {
923                      q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
924                      shouldThrow();
925                  } catch (InterruptedException success) {}
926 +                assertFalse(Thread.interrupted());
927              }});
928  
929          await(pleaseInterrupt);
# Line 1059 | Line 1092 | public class LinkedBlockingDequeTest ext
1092          Thread t = newStartedThread(new CheckedRunnable() {
1093              public void realRun() throws InterruptedException {
1094                  long startTime = System.nanoTime();
1095 <                for (int i = 0; i < SIZE; ++i) {
1095 >                for (int i = 0; i < SIZE; i++)
1096                      assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1064 –                }
1097  
1098                  Thread.currentThread().interrupt();
1099                  try {
# Line 1076 | Line 1108 | public class LinkedBlockingDequeTest ext
1108                      shouldThrow();
1109                  } catch (InterruptedException success) {}
1110                  assertFalse(Thread.interrupted());
1111 +
1112                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1113              }});
1114  
1115          await(pleaseInterrupt);
1116 <        assertThreadStaysAlive(t);
1116 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1117          t.interrupt();
1118          awaitTermination(t);
1119      }
# Line 1113 | Line 1146 | public class LinkedBlockingDequeTest ext
1146                      q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1147                      shouldThrow();
1148                  } catch (InterruptedException success) {}
1149 +                assertFalse(Thread.interrupted());
1150                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1151              }});
1152  
# Line 1121 | Line 1155 | public class LinkedBlockingDequeTest ext
1155          assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1156          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1157          barrier.await();
1158 <        assertThreadStaysAlive(t);
1158 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1159          t.interrupt();
1160          awaitTermination(t);
1161      }
# Line 1201 | Line 1235 | public class LinkedBlockingDequeTest ext
1235                  pleaseTake.countDown();
1236                  q.putLast(86);
1237  
1238 +                Thread.currentThread().interrupt();
1239 +                try {
1240 +                    q.putLast(99);
1241 +                    shouldThrow();
1242 +                } catch (InterruptedException success) {}
1243 +                assertFalse(Thread.interrupted());
1244 +
1245                  pleaseInterrupt.countDown();
1246                  try {
1247                      q.putLast(99);
# Line 1223 | Line 1264 | public class LinkedBlockingDequeTest ext
1264      /**
1265       * timed offerLast times out if full and elements not taken
1266       */
1267 <    public void testTimedOfferLast() throws InterruptedException {
1267 >    public void testTimedOfferLast() {
1268          final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1269          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1270          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1233 | Line 1274 | public class LinkedBlockingDequeTest ext
1274                  long startTime = System.nanoTime();
1275                  assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1276                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1277 +
1278 +                Thread.currentThread().interrupt();
1279 +                try {
1280 +                    q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1281 +                    shouldThrow();
1282 +                } catch (InterruptedException success) {}
1283 +
1284                  pleaseInterrupt.countDown();
1285                  try {
1286                      q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
# Line 1325 | Line 1373 | public class LinkedBlockingDequeTest ext
1373          Thread t = newStartedThread(new CheckedRunnable() {
1374              public void realRun() throws InterruptedException {
1375                  long startTime = System.nanoTime();
1376 <                for (int i = 0; i < SIZE; ++i) {
1376 >                for (int i = 0; i < SIZE; i++)
1377                      assertEquals(SIZE - i - 1,
1378                                   q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1331 –                }
1379  
1380                  Thread.currentThread().interrupt();
1381                  try {
# Line 1348 | Line 1395 | public class LinkedBlockingDequeTest ext
1395              }});
1396  
1397          await(pleaseInterrupt);
1398 <        assertThreadStaysAlive(t);
1398 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1399          t.interrupt();
1400          awaitTermination(t);
1401          checkEmpty(q);
# Line 1496 | Line 1543 | public class LinkedBlockingDequeTest ext
1543       */
1544      public void testToArray() throws InterruptedException {
1545          LinkedBlockingDeque q = populatedDeque(SIZE);
1546 <        Object[] o = q.toArray();
1547 <        for (int i = 0; i < o.length; i++)
1548 <            assertSame(o[i], q.poll());
1546 >        Object[] a = q.toArray();
1547 >        assertSame(Object[].class, a.getClass());
1548 >        for (Object o : a)
1549 >            assertSame(o, q.poll());
1550 >        assertTrue(q.isEmpty());
1551      }
1552  
1553      /**
# Line 1509 | Line 1558 | public class LinkedBlockingDequeTest ext
1558          Integer[] ints = new Integer[SIZE];
1559          Integer[] array = q.toArray(ints);
1560          assertSame(ints, array);
1561 <        for (int i = 0; i < ints.length; i++)
1562 <            assertSame(ints[i], q.remove());
1561 >        for (Integer o : ints)
1562 >            assertSame(o, q.remove());
1563 >        assertTrue(q.isEmpty());
1564      }
1565  
1566      /**
# Line 1726 | Line 1776 | public class LinkedBlockingDequeTest ext
1776      }
1777  
1778      /**
1779 <     * A deserialized serialized deque has same elements in same order
1779 >     * A deserialized/reserialized deque has same elements in same order
1780       */
1781      public void testSerialization() throws Exception {
1782          Queue x = populatedDeque(SIZE);

Diff Legend

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