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.34 by jsr166, Mon Jun 27 04:07:51 2011 UTC vs.
Revision 1.37 by jsr166, Sat Nov 26 05:42:14 2011 UTC

#	Line 191 | Line 191 | public class PhaserTest extends JSR166Te
191		/**
192		* register on a subphaser that is currently empty succeeds, even
193		* in the presence of another non-empty subphaser
194	–	* XXXX broken (hangs) as of 2011-06-26
194		*/
195	<	public void XXXXtestRegisterEmptySubPhaser() {
195	>	public void testRegisterEmptySubPhaser() {
196		Phaser root = new Phaser();
197		Phaser child1 = new Phaser(root, 1);
198		Phaser child2 = new Phaser(root, 0);
199		assertEquals(0, child2.register());
200	+	assertState(root, 0, 2, 2);
201	+	assertState(child1, 0, 1, 1);
202	+	assertState(child2, 0, 1, 1);
203		assertEquals(0, child2.arriveAndDeregister());
204	+	assertState(root, 0, 1, 1);
205	+	assertState(child1, 0, 1, 1);
206	+	assertState(child2, 0, 0, 0);
207		assertEquals(0, child2.register());
208		assertEquals(0, child2.arriveAndDeregister());
209	+	assertState(root, 0, 1, 1);
210	+	assertState(child1, 0, 1, 1);
211		assertState(child2, 0, 0, 0);
212	+	assertEquals(0, child1.arriveAndDeregister());
213	+	assertTerminated(root, 1);
214	+	assertTerminated(child1, 1);
215	+	assertTerminated(child2, 1);
216		}
217
218		/**
#	Line 617 | Line 628 | public class PhaserTest extends JSR166Te
628		count.incrementAndGet();
629		assertEquals(2*k+1, phaser.arrive());
630		assertEquals(2*k+2, phaser.awaitAdvance(2*k+1));
631	<	assertEquals(count.get(), 4*(k+1));
631	>	assertEquals(4*(k+1), count.get());
632		}}}));
633
634		for (Thread thread : threads)

Diff Legend

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