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.21 by jsr166, Sun Nov 7 18:08:22 2010 UTC vs.
Revision 1.28 by jsr166, Fri Dec 3 21:54:32 2010 UTC

# Line 26 | Line 26 | public class PhaserTest extends JSR166Te
26      }
27  
28      private static final int maxParties = 65535;
29 <    
30 <    /** Checks state of phaser. */
29 >
30 >    /** Checks state of unterminated phaser. */
31      protected void assertState(Phaser phaser,
32                                 int phase, int parties, int unarrived) {
33          assertEquals(phase, phaser.getPhase());
34          assertEquals(parties, phaser.getRegisteredParties());
35          assertEquals(unarrived, phaser.getUnarrivedParties());
36          assertEquals(parties - unarrived, phaser.getArrivedParties());
37 <        assertTrue((phaser.getPhase() >= 0) ^ phaser.isTerminated());
37 >        assertFalse(phaser.isTerminated());
38      }
39  
40      /** Checks state of terminated phaser. */
41 <    protected void assertTerminated(Phaser phaser, int parties, int unarrived) {
41 >    protected void assertTerminated(Phaser phaser, int maxPhase, int parties) {
42          assertTrue(phaser.isTerminated());
43 <        assertTrue(phaser.getPhase() < 0);
43 >        int expectedPhase = maxPhase + Integer.MIN_VALUE;
44 >        assertEquals(expectedPhase, phaser.getPhase());
45          assertEquals(parties, phaser.getRegisteredParties());
46 <        assertEquals(unarrived, phaser.getUnarrivedParties());
47 <        assertEquals(parties - unarrived, phaser.getArrivedParties());
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);
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);
262 >        assertTerminated(phaser, 1);
263      }
264  
265      /**
# Line 288 | 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);
294 >        assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
295          assertTrue(phaser.arrive() < 0);
296          assertTrue(phaser.register() < 0);
297          assertTrue(phaser.arriveAndDeregister() < 0);
# Line 329 | Line 332 | public class PhaserTest extends JSR166Te
332          Phaser parent = new Phaser();
333          Phaser child = new Phaser(parent);
334          assertState(child, 0, 0, 0);
335 <        assertState(parent, 0, 1, 1);
335 >        assertState(parent, 0, 0, 0);
336          assertEquals(0, child.register());
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 362 | Line 365 | public class PhaserTest extends JSR166Te
365          Phaser root = new Phaser();
366          Phaser parent = new Phaser(root);
367          Phaser child = new Phaser(parent);
368 <        assertState(root, 0, 1, 1);
369 <        assertState(parent, 0, 1, 1);
368 >        assertState(root, 0, 0, 0);
369 >        assertState(parent, 0, 0, 0);
370          assertState(child, 0, 0, 0);
371          assertEquals(0, child.register());
372          assertState(root, 0, 1, 1);
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);
376 >        assertTerminated(child, 1);
377 >        assertTerminated(parent, 1);
378 >        assertTerminated(root, 1);
379      }
380  
381      /**
# Line 390 | 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);
396 >        assertTerminated(phaser, 2);
397          awaitTermination(t, SHORT_DELAY_MS);
398      }
399  
# Line 594 | Line 597 | public class PhaserTest extends JSR166Te
597                      assertTrue(phaser.awaitAdvance(0) < 0);
598                      assertTrue(phaser.isTerminated());
599                      assertTrue(phaser.getPhase() < 0);
600 +                    assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
601                      assertEquals(3, phaser.getRegisteredParties());
602                  }};
603              threads.add(newStartedThread(r));
604          }
605          threadsStarted.await();
606          phaser.forceTermination();
607 +        assertTrue(phaser.isTerminated());
608 +        assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
609          for (Thread thread : threads)
610              awaitTermination(thread, SMALL_DELAY_MS);
605 –        assertTrue(phaser.isTerminated());
606 –        assertTrue(phaser.getPhase() < 0);
611          assertEquals(3, phaser.getRegisteredParties());
612      }
613  

Diff Legend

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