--- jsr166/src/test/tck/PhaserTest.java	2010/11/29 15:47:29	1.24
+++ jsr166/src/test/tck/PhaserTest.java	2010/12/03 23:55:55	1.29
@@ -27,27 +27,29 @@ public class PhaserTest extends JSR166Te
 
     private static final int maxParties = 65535;
 
-    /** Checks state of phaser. */
+    /** Checks state of unterminated phaser. */
     protected void assertState(Phaser phaser,
                                int phase, int parties, int unarrived) {
         assertEquals(phase, phaser.getPhase());
         assertEquals(parties, phaser.getRegisteredParties());
         assertEquals(unarrived, phaser.getUnarrivedParties());
         assertEquals(parties - unarrived, phaser.getArrivedParties());
-        assertTrue((phaser.getPhase() >= 0) ^ phaser.isTerminated());
+        assertFalse(phaser.isTerminated());
     }
 
     /** Checks state of terminated phaser. */
-    protected void assertTerminated(Phaser phaser, int parties, int unarrived) {
+    protected void assertTerminated(Phaser phaser, int maxPhase, int parties) {
         assertTrue(phaser.isTerminated());
-        assertTrue(phaser.getPhase() < 0);
+        int expectedPhase = maxPhase + Integer.MIN_VALUE;
+        assertEquals(expectedPhase, phaser.getPhase());
         assertEquals(parties, phaser.getRegisteredParties());
-        assertEquals(unarrived, phaser.getUnarrivedParties());
-        assertEquals(parties - unarrived, phaser.getArrivedParties());
+        assertEquals(expectedPhase, phaser.register());
+        assertEquals(expectedPhase, phaser.arrive());
+        assertEquals(expectedPhase, phaser.arriveAndDeregister());
     }
 
-    protected void assertTerminated(Phaser phaser) {
-        assertTerminated(phaser, 0, 0);
+    protected void assertTerminated(Phaser phaser, int maxPhase) {
+        assertTerminated(phaser, maxPhase, 0);
     }
 
     /**
@@ -257,8 +259,7 @@ public class PhaserTest extends JSR166Te
             assertState(phaser, 0, 1, 1);
         }
         assertEquals(0, phaser.arriveAndDeregister());
-        assertTerminated(phaser);
-        assertEquals(1, phaser.getPhase() + Integer.MIN_VALUE);
+        assertTerminated(phaser, 1);
     }
 
     /**
@@ -289,7 +290,7 @@ public class PhaserTest extends JSR166Te
     public void testArrive3() {
         Phaser phaser = new Phaser(1);
         phaser.forceTermination();
-        assertTerminated(phaser, 1, 1);
+        assertTerminated(phaser, 0, 1);
         assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
         assertTrue(phaser.arrive() < 0);
         assertTrue(phaser.register() < 0);
@@ -336,8 +337,8 @@ public class PhaserTest extends JSR166Te
         assertState(child, 0, 1, 1);
         assertState(parent, 0, 1, 1);
         assertEquals(0, child.arriveAndDeregister());
-        assertTerminated(child);
-        assertTerminated(parent);
+        assertTerminated(child, 1);
+        assertTerminated(parent, 1);
     }
 
     /**
@@ -372,10 +373,9 @@ public class PhaserTest extends JSR166Te
         assertState(parent, 0, 1, 1);
         assertState(child, 0, 1, 1);
         assertEquals(0, child.arriveAndDeregister());
-        assertTerminated(child);
-        assertTerminated(parent);
-        assertTerminated(root);
-        assertEquals(1, root.getPhase() + Integer.MIN_VALUE);
+        assertTerminated(child, 1);
+        assertTerminated(parent, 1);
+        assertTerminated(root, 1);
     }
 
     /**
@@ -393,8 +393,7 @@ public class PhaserTest extends JSR166Te
         assertEquals(1, phaser.arriveAndDeregister());
         assertState(phaser, 1, 1, 1);
         assertEquals(1, phaser.arriveAndDeregister());
-        assertTerminated(phaser);
-        assertEquals(2, phaser.getPhase() + Integer.MIN_VALUE);
+        assertTerminated(phaser, 2);
         awaitTermination(t, SHORT_DELAY_MS);
     }
 
@@ -584,6 +583,53 @@ public class PhaserTest extends JSR166Te
     }
 
     /**
+     * awaitAdvance returns the current phase in child phasers
+     */
+    public void testAwaitAdvanceTieredPhaser() throws Exception {
+        final Phaser parent = new Phaser();
+        final List<Phaser> zeroPartyChildren = new ArrayList<Phaser>(3);
+        final List<Phaser> onePartyChildren = new ArrayList<Phaser>(3);
+        for (int i = 0; i < 3; i++) {
+            zeroPartyChildren.add(new Phaser(parent, 0));
+            onePartyChildren.add(new Phaser(parent, 1));
+        }
+        final List<Phaser> phasers = new ArrayList<Phaser>();
+        phasers.addAll(zeroPartyChildren);
+        phasers.addAll(onePartyChildren);
+        phasers.add(parent);
+        for (Phaser phaser : phasers) {
+            assertEquals(-42, phaser.awaitAdvance(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42, SMALL_DELAY_MS, MILLISECONDS));
+        }
+
+        for (Phaser child : onePartyChildren)
+            assertEquals(0, child.arrive());
+        for (Phaser phaser : phasers) {
+            assertEquals(-42, phaser.awaitAdvance(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42, SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(1, phaser.awaitAdvance(0));
+            assertEquals(1, phaser.awaitAdvanceInterruptibly(0));
+            assertEquals(1, phaser.awaitAdvanceInterruptibly(0, SMALL_DELAY_MS, MILLISECONDS));
+        }
+
+        for (Phaser child : onePartyChildren)
+            assertEquals(1, child.arrive());
+        for (Phaser phaser : phasers) {
+            assertEquals(-42, phaser.awaitAdvance(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42));
+            assertEquals(-42, phaser.awaitAdvanceInterruptibly(-42, SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(2, phaser.awaitAdvance(0));
+            assertEquals(2, phaser.awaitAdvanceInterruptibly(0));
+            assertEquals(2, phaser.awaitAdvanceInterruptibly(0, SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(2, phaser.awaitAdvance(1));
+            assertEquals(2, phaser.awaitAdvanceInterruptibly(1));
+            assertEquals(2, phaser.awaitAdvanceInterruptibly(1, SMALL_DELAY_MS, MILLISECONDS));
+        }
+    }
+
+    /**
      * awaitAdvance returns when the phaser is externally terminated
      */
     public void testAwaitAdvance6() throws InterruptedException {
@@ -605,11 +651,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());
     }