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.21 by jsr166, Sun Nov 7 18:08:22 2010 UTC vs.
Revision 1.24 by dl, Mon Nov 29 15:47:29 2010 UTC

#	Line 26 | Line 26 | public class PhaserTest extends JSR166Te
26		}
27
28		private static final int maxParties = 65535;
29	<
29	>
30		/** Checks state of phaser. */
31		protected void assertState(Phaser phaser,
32		int phase, int parties, int unarrived) {
#	Line 258 | Line 258 | public class PhaserTest extends JSR166Te
258		}
259		assertEquals(0, phaser.arriveAndDeregister());
260		assertTerminated(phaser);
261	+	assertEquals(1, phaser.getPhase() + Integer.MIN_VALUE);
262		}
263
264		/**
#	Line 289 | Line 290 | public class PhaserTest extends JSR166Te
290		Phaser phaser = new Phaser(1);
291		phaser.forceTermination();
292		assertTerminated(phaser, 1, 1);
293	+	assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
294		assertTrue(phaser.arrive() < 0);
295		assertTrue(phaser.register() < 0);
296		assertTrue(phaser.arriveAndDeregister() < 0);
#	Line 329 | Line 331 | public class PhaserTest extends JSR166Te
331		Phaser parent = new Phaser();
332		Phaser child = new Phaser(parent);
333		assertState(child, 0, 0, 0);
334	<	assertState(parent, 0, 1, 1);
334	>	assertState(parent, 0, 0, 0);
335		assertEquals(0, child.register());
336		assertState(child, 0, 1, 1);
337		assertState(parent, 0, 1, 1);
#	Line 362 | Line 364 | public class PhaserTest extends JSR166Te
364		Phaser root = new Phaser();
365		Phaser parent = new Phaser(root);
366		Phaser child = new Phaser(parent);
367	<	assertState(root, 0, 1, 1);
368	<	assertState(parent, 0, 1, 1);
367	>	assertState(root, 0, 0, 0);
368	>	assertState(parent, 0, 0, 0);
369		assertState(child, 0, 0, 0);
370		assertEquals(0, child.register());
371		assertState(root, 0, 1, 1);
#	Line 373 | Line 375 | public class PhaserTest extends JSR166Te
375		assertTerminated(child);
376		assertTerminated(parent);
377		assertTerminated(root);
378	+	assertEquals(1, root.getPhase() + Integer.MIN_VALUE);
379		}
380
381		/**
#	Line 391 | Line 394 | public class PhaserTest extends JSR166Te
394		assertState(phaser, 1, 1, 1);
395		assertEquals(1, phaser.arriveAndDeregister());
396		assertTerminated(phaser);
397	+	assertEquals(2, phaser.getPhase() + Integer.MIN_VALUE);
398		awaitTermination(t, SHORT_DELAY_MS);
399		}
400
#	Line 594 | Line 598 | public class PhaserTest extends JSR166Te
598		assertTrue(phaser.awaitAdvance(0) < 0);
599		assertTrue(phaser.isTerminated());
600		assertTrue(phaser.getPhase() < 0);
601	+	assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
602		assertEquals(3, phaser.getRegisteredParties());
603		}};
604		threads.add(newStartedThread(r));
605		}
606		threadsStarted.await();
607		phaser.forceTermination();
608	+	assertEquals(0, phaser.getPhase() + Integer.MIN_VALUE);
609		for (Thread thread : threads)
610		awaitTermination(thread, SMALL_DELAY_MS);
611		assertTrue(phaser.isTerminated());

Diff Legend

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