ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PhaserTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PhaserTest.java (file contents):
Revision 1.24 by dl, Mon Nov 29 15:47:29 2010 UTC vs.
Revision 1.25 by jsr166, Tue Nov 30 01:56:12 2010 UTC

# Line 38 | Line 38 | public class PhaserTest extends JSR166Te
38      }
39  
40      /** Checks state of terminated phaser. */
41 <    protected void assertTerminated(Phaser phaser, int parties, int unarrived) {
41 >    protected void assertTerminated(Phaser phaser,
42 >                                    int maxPhase, int parties, int unarrived) {
43          assertTrue(phaser.isTerminated());
44 <        assertTrue(phaser.getPhase() < 0);
45 <        assertEquals(parties, phaser.getRegisteredParties());
46 <        assertEquals(unarrived, phaser.getUnarrivedParties());
47 <        assertEquals(parties - unarrived, phaser.getArrivedParties());
44 >        int expectedPhase = maxPhase + Integer.MIN_VALUE;
45 >        assertState(phaser, expectedPhase, parties, unarrived);
46 >        assertEquals(expectedPhase, phaser.register());
47 >        assertEquals(expectedPhase, phaser.arrive());
48 >        assertEquals(expectedPhase, phaser.arriveAndDeregister());
49      }
50  
51 <    protected void assertTerminated(Phaser phaser) {
52 <        assertTerminated(phaser, 0, 0);
51 >    protected void assertTerminated(Phaser phaser, int maxPhase) {
52 >        assertTerminated(phaser, maxPhase, 0, 0);
53      }
54  
55      /**
# Line 257 | Line 259 | public class PhaserTest extends JSR166Te
259              assertState(phaser, 0, 1, 1);
260          }
261          assertEquals(0, phaser.arriveAndDeregister());
262 <        assertTerminated(phaser);
261 <        assertEquals(1, phaser.getPhase() + Integer.MIN_VALUE);
262 >        assertTerminated(phaser, 1);
263      }
264  
265      /**
# Line 289 | Line 290 | public class PhaserTest extends JSR166Te
290      public void testArrive3() {
291          Phaser phaser = new Phaser(1);
292          phaser.forceTermination();
293 <        assertTerminated(phaser, 1, 1);
293 >        assertTerminated(phaser, 0, 1, 1);
294          assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
295          assertTrue(phaser.arrive() < 0);
296          assertTrue(phaser.register() < 0);
# Line 336 | Line 337 | public class PhaserTest extends JSR166Te
337          assertState(child, 0, 1, 1);
338          assertState(parent, 0, 1, 1);
339          assertEquals(0, child.arriveAndDeregister());
340 <        assertTerminated(child);
341 <        assertTerminated(parent);
340 >        assertTerminated(child, 1);
341 >        assertTerminated(parent, 1);
342      }
343  
344      /**
# Line 372 | Line 373 | public class PhaserTest extends JSR166Te
373          assertState(parent, 0, 1, 1);
374          assertState(child, 0, 1, 1);
375          assertEquals(0, child.arriveAndDeregister());
376 <        assertTerminated(child);
377 <        assertTerminated(parent);
378 <        assertTerminated(root);
378 <        assertEquals(1, root.getPhase() + Integer.MIN_VALUE);
376 >        assertTerminated(child, 1);
377 >        assertTerminated(parent, 1);
378 >        assertTerminated(root, 1);
379      }
380  
381      /**
# Line 393 | Line 393 | public class PhaserTest extends JSR166Te
393          assertEquals(1, phaser.arriveAndDeregister());
394          assertState(phaser, 1, 1, 1);
395          assertEquals(1, phaser.arriveAndDeregister());
396 <        assertTerminated(phaser);
397 <        assertEquals(2, phaser.getPhase() + Integer.MIN_VALUE);
396 >        assertTerminated(phaser, 2);
397          awaitTermination(t, SHORT_DELAY_MS);
398      }
399  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines