--- jsr166/src/test/tck/PhaserTest.java	2009/12/02 01:08:30	1.11
+++ jsr166/src/test/tck/PhaserTest.java	2010/10/09 19:30:35	1.15
@@ -176,7 +176,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 +235,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 +252,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 +283,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());
     }
 
@@ -470,12 +470,12 @@ public class PhaserTest extends JSR166Te
             threads.add(newStartedThread(new CheckedRunnable() {
                     public void realRun() throws InterruptedException {
                         phaser.register();
-                        phaser.arrive();
+                        phaser.arriveAndAwaitAdvance();
                     }}));
         }
-        Thread.sleep(LONG_DELAY_MS);
+        Thread.sleep(MEDIUM_DELAY_MS);
         assertEquals(phaser.getArrivedParties(), 3);
-        phaser.arrive();
+        phaser.arriveAndAwaitAdvance();
         for (Thread thread : threads)
             thread.join();
     }