--- jsr166/src/test/tck/PhaserTest.java	2009/12/01 10:03:59	1.10
+++ jsr166/src/test/tck/PhaserTest.java	2010/09/16 00:52:49	1.14
@@ -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());
     }
 
@@ -465,22 +465,17 @@ public class PhaserTest extends JSR166Te
      */
     public void testArriveAndAwaitAdvance3() throws InterruptedException {
         final Phaser phaser = new Phaser(1);
-        final AtomicInteger arrivingCount = new AtomicInteger(0);
         final List<Thread> threads = new ArrayList<Thread>();
-        for (int i = 0; i < 6; i++) {
+        for (int i = 0; i < 3; i++) {
             threads.add(newStartedThread(new CheckedRunnable() {
-                public void realRun() throws InterruptedException {
-                    phaser.register();
-                    sleepTillInterrupted(SHORT_DELAY_MS);
-                    arrivingCount.getAndIncrement();
-                    phaser.arrive();
-                }}));
+                    public void realRun() throws InterruptedException {
+                        phaser.register();
+                        phaser.arriveAndAwaitAdvance();
+                    }}));
         }
-        int phaseNumber = phaser.arriveAndAwaitAdvance();
-        arrivingCount.incrementAndGet();
-        //the + 1 adds to expectedArrive to account for the main threads arrival
-        int expectedArrived = phaseNumber > 0 ? phaseNumber * six + 1 : phaser.getArrivedParties() + 1;
-        assertEquals(expectedArrived, arrivingCount.get());
+        Thread.sleep(MEDIUM_DELAY_MS);
+        assertEquals(phaser.getArrivedParties(), 3);
+        phaser.arriveAndAwaitAdvance();
         for (Thread thread : threads)
             thread.join();
     }