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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.20 by jsr166, Sat Nov 21 19:11:53 2009 UTC vs.
Revision 1.22 by jsr166, Sat Nov 21 22:00:46 2009 UTC

# Line 332 | Line 332 | public class PriorityBlockingQueueTest e
332              public void realRun() {
333                  q.put(new Integer(0));
334                  q.put(new Integer(0));
335 <                threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
336 <                threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
335 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
336 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
337              }});
338  
339          t.start();
# Line 453 | Line 453 | public class PriorityBlockingQueueTest e
453          Thread t = new Thread(new CheckedRunnable() {
454              public void realRun() throws InterruptedException {
455                  assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
456 <                assertEquals(0, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
456 >                assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
457                  try {
458                      q.poll(LONG_DELAY_MS, MILLISECONDS);
459 <                    threadShouldThrow();
459 >                    shouldThrow();
460                  } catch (InterruptedException success) {}
461              }});
462  
463          t.start();
464          Thread.sleep(SMALL_DELAY_MS);
465 <        assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
465 >        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
466          t.interrupt();
467          t.join();
468      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines