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.34 by jsr166, Mon Jun 27 04:07:51 2011 UTC vs.
Revision 1.38 by jsr166, Wed Dec 31 16:44:02 2014 UTC

# Line 12 | Line 12 | import java.util.concurrent.Phaser;
12   import java.util.concurrent.CountDownLatch;
13   import java.util.concurrent.TimeoutException;
14   import static java.util.concurrent.TimeUnit.MILLISECONDS;
15 – import static java.util.concurrent.TimeUnit.NANOSECONDS;
16 – import java.util.concurrent.atomic.AtomicBoolean;
15   import java.util.concurrent.atomic.AtomicInteger;
16  
17   public class PhaserTest extends JSR166TestCase {
# Line 191 | Line 189 | public class PhaserTest extends JSR166Te
189      /**
190       * register on a subphaser that is currently empty succeeds, even
191       * in the presence of another non-empty subphaser
194 –     * XXXX broken (hangs) as of 2011-06-26
192       */
193 <    public void XXXXtestRegisterEmptySubPhaser() {
193 >    public void testRegisterEmptySubPhaser() {
194          Phaser root = new Phaser();
195          Phaser child1 = new Phaser(root, 1);
196          Phaser child2 = new Phaser(root, 0);
197          assertEquals(0, child2.register());
198 +        assertState(root, 0, 2, 2);
199 +        assertState(child1, 0, 1, 1);
200 +        assertState(child2, 0, 1, 1);
201          assertEquals(0, child2.arriveAndDeregister());
202 +        assertState(root, 0, 1, 1);
203 +        assertState(child1, 0, 1, 1);
204 +        assertState(child2, 0, 0, 0);
205          assertEquals(0, child2.register());
206          assertEquals(0, child2.arriveAndDeregister());
207 +        assertState(root, 0, 1, 1);
208 +        assertState(child1, 0, 1, 1);
209          assertState(child2, 0, 0, 0);
210 +        assertEquals(0, child1.arriveAndDeregister());
211 +        assertTerminated(root, 1);
212 +        assertTerminated(child1, 1);
213 +        assertTerminated(child2, 1);
214      }
215  
216      /**
# Line 617 | Line 626 | public class PhaserTest extends JSR166Te
626                          count.incrementAndGet();
627                          assertEquals(2*k+1, phaser.arrive());
628                          assertEquals(2*k+2, phaser.awaitAdvance(2*k+1));
629 <                        assertEquals(count.get(), 4*(k+1));
629 >                        assertEquals(4*(k+1), count.get());
630                      }}}));
631  
632          for (Thread thread : threads)

Diff Legend

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