--- jsr166/src/test/tck/PriorityBlockingQueueTest.java 2009/11/22 18:57:17 1.24 +++ jsr166/src/test/tck/PriorityBlockingQueueTest.java 2009/12/01 06:03:49 1.25 @@ -699,15 +699,15 @@ public class PriorityBlockingQueueTest e ExecutorService executor = Executors.newFixedThreadPool(2); executor.execute(new CheckedRunnable() { public void realRun() throws InterruptedException { - threadAssertNull(q.poll()); - threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); - threadAssertTrue(q.isEmpty()); + assertNull(q.poll()); + assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); + assertTrue(q.isEmpty()); }}); executor.execute(new CheckedRunnable() { public void realRun() throws InterruptedException { Thread.sleep(SMALL_DELAY_MS); - q.put(new Integer(1)); + q.put(one); }}); joinPool(executor);