ViewVC Help

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

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

Comparing jsr166/src/test/tck/CountDownLatchTest.java (file contents):
Revision 1.13 by jsr166, Sat Nov 21 05:05:38 2009 UTC vs.
Revision 1.16 by jsr166, Tue Mar 15 19:47:06 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 13 | Line 13 | import static java.util.concurrent.TimeU
13
14		public class CountDownLatchTest extends JSR166TestCase {
15		public static void main(String[] args) {
16	<	junit.textui.TestRunner.run (suite());
16	>	junit.textui.TestRunner.run(suite());
17		}
18		public static Test suite() {
19		return new TestSuite(CountDownLatchTest.class);
#	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();
#	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();
#	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
#	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