ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/PhaserTest.java

Comparing jsr166/src/test/tck/PhaserTest.java (file contents):
Revision 1.27 by jsr166, Fri Dec 3 02:09:40 2010 UTC vs.
Revision 1.28 by jsr166, Fri Dec 3 21:54:32 2010 UTC

#	Line 27 | Line 27 | public class PhaserTest extends JSR166Te
27
28		private static final int maxParties = 65535;
29
30	<	/** Checks state of phaser. */
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,
42	<	int maxPhase, int parties, int unarrived) {
41	>	protected void assertTerminated(Phaser phaser, int maxPhase, int parties) {
42		assertTrue(phaser.isTerminated());
43		int expectedPhase = maxPhase + Integer.MIN_VALUE;
44		assertEquals(expectedPhase, phaser.getPhase());
#	Line 50 | Line 49 | public class PhaserTest extends JSR166Te
49		}
50
51		protected void assertTerminated(Phaser phaser, int maxPhase) {
52	<	assertTerminated(phaser, maxPhase, 0, 0);
52	>	assertTerminated(phaser, maxPhase, 0);
53		}
54
55		/**
#	Line 291 | Line 290 | public class PhaserTest extends JSR166Te
290		public void testArrive3() {
291		Phaser phaser = new Phaser(1);
292		phaser.forceTermination();
293	<	assertTerminated(phaser, 0, 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);

Diff Legend

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