--- jsr166/src/test/tck/PhaserTest.java	2010/11/30 01:56:12	1.25
+++ jsr166/src/test/tck/PhaserTest.java	2010/12/03 02:09:40	1.27
@@ -42,7 +42,8 @@ public class PhaserTest extends JSR166Te
                                     int maxPhase, int parties, int unarrived) {
         assertTrue(phaser.isTerminated());
         int expectedPhase = maxPhase + Integer.MIN_VALUE;
-        assertState(phaser, expectedPhase, parties, unarrived);
+        assertEquals(expectedPhase, phaser.getPhase());
+        assertEquals(parties, phaser.getRegisteredParties());
         assertEquals(expectedPhase, phaser.register());
         assertEquals(expectedPhase, phaser.arrive());
         assertEquals(expectedPhase, phaser.arriveAndDeregister());
@@ -604,11 +605,10 @@ public class PhaserTest extends JSR166Te
         }
         threadsStarted.await();
         phaser.forceTermination();
+        assertTrue(phaser.isTerminated());
         assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
         for (Thread thread : threads)
             awaitTermination(thread, SMALL_DELAY_MS);
-        assertTrue(phaser.isTerminated());
-        assertTrue(phaser.getPhase() < 0);
         assertEquals(3, phaser.getRegisteredParties());
     }