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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.67 by jsr166, Sun Oct 16 20:16:36 2016 UTC vs.
Revision 1.76 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 15 | Line 15 | import java.util.List;
15   import java.util.NoSuchElementException;
16   import java.util.Queue;
17   import java.util.concurrent.BlockingQueue;
18 + import java.util.concurrent.Callable;
19   import java.util.concurrent.CountDownLatch;
20   import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
# Line 182 | Line 183 | public class LinkedTransferQueueTest ext
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
187          for (int i = 0; i < SIZE; ++i) {
188              assertEquals(i, q.size());
189              q.put(i);
# Line 208 | Line 209 | public class LinkedTransferQueueTest ext
209          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
210          Thread t = newStartedThread(new CheckedRunnable() {
211              public void realRun() throws InterruptedException {
212 <                for (int i = 0; i < SIZE; ++i) {
212 <                    assertEquals(i, q.take());
213 <                }
212 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213  
214                  Thread.currentThread().interrupt();
215                  try {
# Line 228 | Line 227 | public class LinkedTransferQueueTest ext
227              }});
228  
229          await(pleaseInterrupt);
230 <        assertThreadStaysAlive(t);
230 >        assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232          awaitTermination(t);
233      }
# Line 279 | Line 278 | public class LinkedTransferQueueTest ext
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280          final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
281 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
282          Thread t = newStartedThread(new CheckedRunnable() {
283              public void realRun() throws InterruptedException {
284                  long startTime = System.nanoTime();
285                  for (int i = 0; i < SIZE; ++i)
286                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 <                aboutToWait.countDown();
287 >
288 >                pleaseInterrupt.countDown();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertFalse(Thread.interrupted());
294 +
295                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296              }});
297  
298 <        aboutToWait.await();
299 <        waitForThreadToEnterWaitState(t);
298 >        await(pleaseInterrupt);
299 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300          t.interrupt();
301          awaitTermination(t);
302          checkEmpty(q);
# Line 415 | Line 417 | public class LinkedTransferQueueTest ext
417       */
418      public void testContainsAll() {
419          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
420 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
420 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
421          for (int i = 0; i < SIZE; ++i) {
422              assertTrue(q.containsAll(p));
423              assertFalse(p.containsAll(q));
# Line 544 | Line 546 | public class LinkedTransferQueueTest ext
546       * iterator ordering is FIFO
547       */
548      public void testIteratorOrdering() {
549 <        final LinkedTransferQueue<Integer> q
548 <            = new LinkedTransferQueue<Integer>();
549 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
550          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
551          q.add(one);
552          q.add(two);
# Line 740 | Line 741 | public class LinkedTransferQueueTest ext
741              }});
742  
743          threadStarted.await();
744 <        waitForThreadToEnterWaitState(t);
745 <        assertEquals(1, q.getWaitingConsumerCount());
746 <        assertTrue(q.hasWaitingConsumer());
744 >        Callable<Boolean> oneConsumer
745 >            = new Callable<Boolean>() { public Boolean call() {
746 >                return q.hasWaitingConsumer()
747 >                && q.getWaitingConsumerCount() == 1; }};
748 >        waitForThreadToEnterWaitState(t, oneConsumer);
749  
750          assertTrue(q.offer(one));
751          assertEquals(0, q.getWaitingConsumerCount());
# Line 764 | Line 767 | public class LinkedTransferQueueTest ext
767  
768      /**
769       * transfer waits until a poll occurs. The transfered element
770 <     * is returned by this associated poll.
770 >     * is returned by the associated poll.
771       */
772      public void testTransfer2() throws InterruptedException {
773 <        final LinkedTransferQueue<Integer> q
771 <            = new LinkedTransferQueue<Integer>();
773 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
774          final CountDownLatch threadStarted = new CountDownLatch(1);
775  
776          Thread t = newStartedThread(new CheckedRunnable() {
# Line 779 | Line 781 | public class LinkedTransferQueueTest ext
781              }});
782  
783          threadStarted.await();
784 <        waitForThreadToEnterWaitState(t);
785 <        assertEquals(1, q.size());
784 >        Callable<Boolean> oneElement
785 >            = new Callable<Boolean>() { public Boolean call() {
786 >                return !q.isEmpty() && q.size() == 1; }};
787 >        waitForThreadToEnterWaitState(t, oneElement);
788 >
789          assertSame(five, q.poll());
790          checkEmpty(q);
791          awaitTermination(t);
# Line 790 | Line 795 | public class LinkedTransferQueueTest ext
795       * transfer waits until a poll occurs, and then transfers in fifo order
796       */
797      public void testTransfer3() throws InterruptedException {
798 <        final LinkedTransferQueue<Integer> q
794 <            = new LinkedTransferQueue<Integer>();
798 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
799  
800          Thread first = newStartedThread(new CheckedRunnable() {
801              public void realRun() throws InterruptedException {
802                  q.transfer(four);
803 <                assertTrue(!q.contains(four));
803 >                assertFalse(q.contains(four));
804                  assertEquals(1, q.size());
805              }});
806  
# Line 844 | Line 848 | public class LinkedTransferQueueTest ext
848  
849      /**
850       * transfer waits until a take occurs. The transfered element
851 <     * is returned by this associated take.
851 >     * is returned by the associated take.
852       */
853      public void testTransfer5() throws InterruptedException {
854 <        final LinkedTransferQueue<Integer> q
851 <            = new LinkedTransferQueue<Integer>();
854 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
855  
856          Thread t = newStartedThread(new CheckedRunnable() {
857              public void realRun() throws InterruptedException {
# Line 961 | Line 964 | public class LinkedTransferQueueTest ext
964              }});
965  
966          await(pleaseInterrupt);
967 <        assertThreadStaysAlive(t);
967 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
968          t.interrupt();
969          awaitTermination(t);
970          checkEmpty(q);
# Line 1029 | Line 1032 | public class LinkedTransferQueueTest ext
1032      }
1033  
1034      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1035 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1035 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1036          checkEmpty(q);
1037          for (int i = 0; i < n; i++) {
1038              assertEquals(i, q.size());

Diff Legend

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