--- jsr166/src/test/tck/ArrayBlockingQueueTest.java	2009/11/22 18:57:16	1.26
+++ jsr166/src/test/tck/ArrayBlockingQueueTest.java	2010/08/25 00:07:02	1.29
@@ -15,7 +15,7 @@ import java.io.*;
 
 public class ArrayBlockingQueueTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(ArrayBlockingQueueTest.class);
@@ -319,30 +319,26 @@ public class ArrayBlockingQueueTest exte
      * put blocks waiting for take when full
      */
     public void testPutWithTake() throws InterruptedException {
-        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
+        final int capacity = 2;
+        final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
         Thread t = new Thread(new CheckedRunnable() {
-            public void realRun() {
-                int added = 0;
+            public void realRun() throws InterruptedException {
+                for (int i = 0; i < capacity + 1; i++)
+                    q.put(i);
                 try {
-                    q.put(new Object());
-                    ++added;
-                    q.put(new Object());
-                    ++added;
-                    q.put(new Object());
-                    ++added;
-                    q.put(new Object());
-                    ++added;
-                    threadShouldThrow();
-                } catch (InterruptedException success) {
-                    threadAssertTrue(added >= 2);
-                }
+                    q.put(99);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
 
         t.start();
         Thread.sleep(SHORT_DELAY_MS);
-        q.take();
+        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.take());
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
+        assertEquals(q.remainingCapacity(), 0);
     }
 
     /**
@@ -689,7 +685,7 @@ public class ArrayBlockingQueueTest exte
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
         q.add(two);
         q.add(one);
@@ -700,8 +696,8 @@ public class ArrayBlockingQueueTest exte
         it.remove();
 
         it = q.iterator();
-        assertEquals(it.next(), one);
-        assertEquals(it.next(), three);
+        assertSame(it.next(), one);
+        assertSame(it.next(), three);
         assertFalse(it.hasNext());
     }
 
@@ -726,7 +722,7 @@ public class ArrayBlockingQueueTest exte
     /**
      * Modifications do not cause iterators to fail
      */
-    public void testWeaklyConsistentIteration () {
+    public void testWeaklyConsistentIteration() {
         final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
         q.add(one);
         q.add(two);
@@ -761,19 +757,18 @@ public class ArrayBlockingQueueTest exte
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(q.offer(three));
-                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
-                threadAssertEquals(0, q.remainingCapacity());
+                assertFalse(q.offer(three));
+                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
+                assertEquals(0, q.remainingCapacity());
             }});
 
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 Thread.sleep(SMALL_DELAY_MS);
-                threadAssertEquals(one, q.take());
+                assertSame(one, q.take());
             }});
 
         joinPool(executor);
-
     }
 
     /**
@@ -784,9 +779,9 @@ public class ArrayBlockingQueueTest exte
         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() {