--- jsr166/src/test/tck/PhaserTest.java	2009/12/02 10:50:48	1.12
+++ jsr166/src/test/tck/PhaserTest.java	2010/10/11 05:35:19	1.16
@@ -8,7 +8,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -176,7 +178,7 @@ public class PhaserTest extends JSR166Te
     }
 
     /**
-     *  Arrive() on a registered phaser increments phase.
+     * Arrive() on a registered phaser increments phase.
      */
     public void testArrive1() {
         Phaser phaser = new Phaser(1);
@@ -235,7 +237,7 @@ public class PhaserTest extends JSR166Te
         phaser.register();
         phaser.arrive();
         int p = phaser.getArrivedParties();
-        assertTrue(p == 1);
+        assertEquals(1, p);
         phaser.arriveAndDeregister();
         assertTrue(phaser.getArrivedParties() < p);
     }
@@ -252,8 +254,8 @@ public class PhaserTest extends JSR166Te
         assertTrue(parent.getUnarrivedParties() > 0);
         assertTrue(root.getUnarrivedParties() > 0);
         root.arriveAndDeregister();
-        assertTrue(parent.getUnarrivedParties() == 0);
-        assertTrue(root.getUnarrivedParties() == 0);
+        assertEquals(0, parent.getUnarrivedParties());
+        assertEquals(0, root.getUnarrivedParties());
         assertTrue(root.isTerminated() && parent.isTerminated());
     }
 
@@ -283,8 +285,8 @@ public class PhaserTest extends JSR166Te
         assertTrue(child.getUnarrivedParties() > 0);
         root.register();
         root.arriveAndDeregister();
-        assertTrue(parent.getUnarrivedParties() == 0);
-        assertTrue(child.getUnarrivedParties() == 0);
+        assertEquals(0, parent.getUnarrivedParties());
+        assertEquals(0, child.getUnarrivedParties());
         assertTrue(root.isTerminated());
     }
 
@@ -445,17 +447,27 @@ public class PhaserTest extends JSR166Te
      */
     public void testArriveAndAwaitAdvance2() throws InterruptedException {
         final Phaser phaser = new Phaser(2);
-        Thread th = newStartedThread(new CheckedRunnable() {
-            public void realRun() {
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final AtomicBoolean advanced = new AtomicBoolean(false);
+        final AtomicBoolean checkedInterruptStatus = new AtomicBoolean(false);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                threadStarted.countDown();
                 phaser.arriveAndAwaitAdvance();
+                advanced.set(true);
+                assertTrue(Thread.currentThread().isInterrupted());
+                while (!checkedInterruptStatus.get())
+                    Thread.yield();
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
-        th.interrupt();
-        Thread.sleep(SMALL_DELAY_MS);
+        assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+        t.interrupt();
         phaser.arrive();
-        assertFalse(th.isInterrupted());
-        th.join();
+        while (!advanced.get())
+            Thread.yield();
+        assertTrue(t.isInterrupted());
+        checkedInterruptStatus.set(true);
+        awaitTermination(t, SMALL_DELAY_MS);
     }
 
     /**
@@ -473,7 +485,7 @@ public class PhaserTest extends JSR166Te
                         phaser.arriveAndAwaitAdvance();
                     }}));
         }
-        Thread.sleep(LONG_DELAY_MS);
+        Thread.sleep(MEDIUM_DELAY_MS);
         assertEquals(phaser.getArrivedParties(), 3);
         phaser.arriveAndAwaitAdvance();
         for (Thread thread : threads)