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.71 by jsr166, Sat Mar 18 20:42:20 2017 UTC vs.
Revision 1.78 by jsr166, Sun May 14 01:30:34 2017 UTC

# Line 209 | 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) {
213 <                    assertEquals(i, q.take());
214 <                }
212 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213  
214                  Thread.currentThread().interrupt();
215                  try {
# Line 229 | 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 280 | 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)
285 >                for (int i = 0; i < SIZE; i++)
286                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 <                aboutToWait.countDown();
287 >
288 >                Thread.currentThread().interrupt();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertFalse(Thread.interrupted());
294 +
295 +                pleaseInterrupt.countDown();
296 +                try {
297 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
298 +                    shouldThrow();
299 +                } catch (InterruptedException success) {}
300 +                assertFalse(Thread.interrupted());
301 +
302                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304  
305 <        aboutToWait.await();
306 <        waitForThreadToEnterWaitState(t);
305 >        await(pleaseInterrupt);
306 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308          awaitTermination(t);
309          checkEmpty(q);
# Line 317 | Line 325 | public class LinkedTransferQueueTest ext
325                      q.poll(LONG_DELAY_MS, MILLISECONDS);
326                      shouldThrow();
327                  } catch (InterruptedException success) {}
328 +                assertFalse(Thread.interrupted());
329                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330              }});
331  
# Line 963 | Line 972 | public class LinkedTransferQueueTest ext
972              }});
973  
974          await(pleaseInterrupt);
975 <        assertThreadStaysAlive(t);
975 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
976          t.interrupt();
977          awaitTermination(t);
978          checkEmpty(q);

Diff Legend

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