--- jsr166/src/test/tck/PhaserTest.java	2009/11/21 20:58:45	1.8
+++ jsr166/src/test/tck/PhaserTest.java	2009/12/02 19:02:37	1.13
@@ -194,7 +194,7 @@ public class PhaserTest extends JSR166Te
         for (int i = 0; i < 10; i++)
             phaser.register();
             threads.add(newStartedThread(new CheckedRunnable() {
-                void realRun() throws InterruptedException {
+                public void realRun() throws InterruptedException {
                     Thread.sleep(SMALL_DELAY_MS);
                     phaser.arriveAndDeregister();
                 }}));
@@ -295,7 +295,7 @@ public class PhaserTest extends JSR166Te
     public void testArriveAndDeregister6() throws InterruptedException {
         final Phaser phaser = new Phaser(2);
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 sleepTillInterrupted(SHORT_DELAY_MS);
                 phaser.arrive();
             }});
@@ -330,7 +330,7 @@ public class PhaserTest extends JSR166Te
         phaser.register();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
+            public void realRun() throws InterruptedException {
                 phaser.register();
                 sleepTillInterrupted(LONG_DELAY_MS);
                 phaser.awaitAdvance(phaser.arrive());
@@ -353,12 +353,12 @@ public class PhaserTest extends JSR166Te
         List<Thread> threads = new ArrayList<Thread>();
         for (int i = 0; i < 4; i++) {
             threads.add(newStartedThread(new CheckedRunnable() {
-                void realRun() {
+                public void realRun() {
                     int phase = phaser.arrive();
                     phaseCount.incrementAndGet();
                     sleepTillInterrupted(SMALL_DELAY_MS);
                     phaser.awaitAdvance(phase);
-                    threadAssertTrue(phaseCount.get() == 4);
+                    assertEquals(phaseCount.get(), 4);
                 }}));
         }
         for (Thread thread : threads)
@@ -376,12 +376,12 @@ public class PhaserTest extends JSR166Te
         List<Thread> threads = new ArrayList<Thread>();
         for (int i = 0; i < 8; i++) {
             threads.add(newStartedThread(new CheckedRunnable() {
-                void realRun() {
+                public void realRun() {
                     sleepTillInterrupted(SHORT_DELAY_MS);
                     phaser.arrive();
                 }}));
             phase = phaser.awaitAdvance(phaser.arrive());
-            threadAssertEquals(phase, phaser.getPhase());
+            assertEquals(phase, phaser.getPhase());
         }
         for (Thread thread : threads)
             thread.join();
@@ -399,14 +399,14 @@ public class PhaserTest extends JSR166Te
          * waits for the second thread's party to arrive
          */
         Thread t1 = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 sleepTillInterrupted(SMALL_DELAY_MS);
                 int phase = phaser.awaitAdvance(phaser.arrive());
                 /*
                  * This point is reached when force termination is called in which phase = -1
                  */
-                threadAssertTrue(phase < 0);
-                threadAssertTrue(phaser.isTerminated());
+                assertTrue(phase < 0);
+                assertTrue(phaser.isTerminated());
             }});
         /*
          * This thread will cause the first thread run to wait, in doing so
@@ -414,12 +414,12 @@ public class PhaserTest extends JSR166Te
          * should exit peacefully as this one
          */
         Thread t2 = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 sleepTillInterrupted(MEDIUM_DELAY_MS);
                 int p1 = phaser.arrive();
                 int phase = phaser.awaitAdvance(p1);
-                threadAssertTrue(phase < 0);
-                threadAssertTrue(phaser.isTerminated());
+                assertTrue(phase < 0);
+                assertTrue(phaser.isTerminated());
             }});
 
         phaser.arrive();
@@ -446,7 +446,7 @@ public class PhaserTest extends JSR166Te
     public void testArriveAndAwaitAdvance2() throws InterruptedException {
         final Phaser phaser = new Phaser(2);
         Thread th = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 phaser.arriveAndAwaitAdvance();
             }});
 
@@ -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() {
-                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;
-        threadAssertEquals(expectedArrived, arrivingCount.get());
+        Thread.sleep(MEDIUM_DELAY_MS);
+        assertEquals(phaser.getArrivedParties(), 3);
+        phaser.arriveAndAwaitAdvance();
         for (Thread thread : threads)
             thread.join();
     }