ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CountDownLatchTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CountDownLatchTest.java (file contents):
Revision 1.14 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.17 by dl, Fri May 6 11:22:07 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# Line 59 | Line 59 | public class CountDownLatchTest extends
59  
60          Thread t = new Thread(new CheckedRunnable() {
61              public void realRun() throws InterruptedException {
62 <                threadAssertTrue(l.getCount() > 0);
62 >                assertTrue(l.getCount() > 0);
63                  l.await();
64 <                threadAssertTrue(l.getCount() == 0);
64 >                assertEquals(0, l.getCount());
65              }});
66  
67          t.start();
68          assertEquals(l.getCount(), 2);
69 <        Thread.sleep(SHORT_DELAY_MS);
69 >        delay(SHORT_DELAY_MS);
70          l.countDown();
71          assertEquals(l.getCount(), 1);
72          l.countDown();
# Line 83 | Line 83 | public class CountDownLatchTest extends
83  
84          Thread t = new Thread(new CheckedRunnable() {
85              public void realRun() throws InterruptedException {
86 <                threadAssertTrue(l.getCount() > 0);
87 <                threadAssertTrue(l.await(SMALL_DELAY_MS, MILLISECONDS));
86 >                assertTrue(l.getCount() > 0);
87 >                assertTrue(l.await(SMALL_DELAY_MS, MILLISECONDS));
88              }});
89  
90          t.start();
91          assertEquals(l.getCount(), 2);
92 <        Thread.sleep(SHORT_DELAY_MS);
92 >        delay(SHORT_DELAY_MS);
93          l.countDown();
94          assertEquals(l.getCount(), 1);
95          l.countDown();
# Line 104 | Line 104 | public class CountDownLatchTest extends
104          final CountDownLatch l = new CountDownLatch(1);
105          Thread t = new Thread(new CheckedInterruptedRunnable() {
106              public void realRun() throws InterruptedException {
107 <                threadAssertTrue(l.getCount() > 0);
107 >                assertTrue(l.getCount() > 0);
108                  l.await();
109              }});
110  
# Line 121 | Line 121 | public class CountDownLatchTest extends
121          final CountDownLatch l = new CountDownLatch(1);
122          Thread t = new Thread(new CheckedInterruptedRunnable() {
123              public void realRun() throws InterruptedException {
124 <                threadAssertTrue(l.getCount() > 0);
124 >                assertTrue(l.getCount() > 0);
125                  l.await(MEDIUM_DELAY_MS, MILLISECONDS);
126              }});
127  
128          t.start();
129 <        Thread.sleep(SHORT_DELAY_MS);
129 >        delay(SHORT_DELAY_MS);
130          assertEquals(l.getCount(), 1);
131          t.interrupt();
132          t.join();
# Line 139 | Line 139 | public class CountDownLatchTest extends
139          final CountDownLatch l = new CountDownLatch(1);
140          Thread t = new Thread(new CheckedRunnable() {
141              public void realRun() throws InterruptedException {
142 <                threadAssertTrue(l.getCount() > 0);
143 <                threadAssertFalse(l.await(SHORT_DELAY_MS, MILLISECONDS));
144 <                threadAssertTrue(l.getCount() > 0);
142 >                assertTrue(l.getCount() > 0);
143 >                assertFalse(l.await(SHORT_DELAY_MS, MILLISECONDS));
144 >                assertTrue(l.getCount() > 0);
145              }});
146  
147          t.start();

Diff Legend

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