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.15 by jsr166, Sun May 24 01:23:17 2015 UTC vs.
Revision 1.19 by jsr166, Sat May 13 22:38:09 2017 UTC

# Line 235 | Line 235 | public abstract class BlockingQueueTest
235                      shouldThrow();
236                  } catch (InterruptedException success) {}
237                  assertFalse(Thread.interrupted());
238 +
239 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
240              }});
241  
242          barrier.await();
# Line 243 | Line 245 | public abstract class BlockingQueueTest
245          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
246  
247          barrier.await();
248 <        assertThreadStaysAlive(t);
248 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
249          t.interrupt();
250          awaitTermination(t);
251      }
# Line 265 | Line 267 | public abstract class BlockingQueueTest
267              }});
268  
269          await(threadStarted);
270 <        assertThreadStaysAlive(t);
270 >        assertThreadBlocks(t, Thread.State.WAITING);
271          t.interrupt();
272          awaitTermination(t);
273      }
# Line 306 | Line 308 | public abstract class BlockingQueueTest
308              }});
309  
310          await(threadStarted);
311 <        assertThreadStaysAlive(t);
311 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
312          t.interrupt();
313          awaitTermination(t);
314      }
# Line 348 | Line 350 | public abstract class BlockingQueueTest
350                  assertEquals((pass == 0), q.contains(elts[i]));
351                  assertEquals((pass == 0), q.remove(elts[i]));
352                  assertFalse(q.contains(elts[i]));
353 <                assertTrue(q.contains(elts[i-1]));
353 >                assertTrue(q.contains(elts[i - 1]));
354                  if (i < size - 1)
355 <                    assertTrue(q.contains(elts[i+1]));
355 >                    assertTrue(q.contains(elts[i + 1]));
356              }
357          }
358          if (size > 0)
359              assertTrue(q.contains(elts[0]));
360          for (int i = size - 2; i >= 0; i -= 2) {
361              assertTrue(q.contains(elts[i]));
362 <            assertFalse(q.contains(elts[i+1]));
362 >            assertFalse(q.contains(elts[i + 1]));
363              assertTrue(q.remove(elts[i]));
364              assertFalse(q.contains(elts[i]));
365 <            assertFalse(q.remove(elts[i+1]));
366 <            assertFalse(q.contains(elts[i+1]));
365 >            assertFalse(q.remove(elts[i + 1]));
366 >            assertFalse(q.contains(elts[i + 1]));
367          }
368          checkEmpty(q);
369      }

Diff Legend

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