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.10 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.11 by jsr166, Sat Nov 21 02:07:26 2009 UTC

#	Line 12 | Line 12 | import java.util.concurrent.*;
12
13		public class CountDownLatchTest extends JSR166TestCase {
14		public static void main(String[] args) {
15	<	junit.textui.TestRunner.run (suite());
15	>	junit.textui.TestRunner.run (suite());
16		}
17		public static Test suite() {
18	<	return new TestSuite(CountDownLatchTest.class);
18	>	return new TestSuite(CountDownLatchTest.class);
19		}
20
21		/**
#	Line 32 | Line 32 | public class CountDownLatchTest extends
32		* getCount returns initial count and decreases after countDown
33		*/
34		public void testGetCount() {
35	<	final CountDownLatch l = new CountDownLatch(2);
36	<	assertEquals(2, l.getCount());
37	<	l.countDown();
38	<	assertEquals(1, l.getCount());
35	>	final CountDownLatch l = new CountDownLatch(2);
36	>	assertEquals(2, l.getCount());
37	>	l.countDown();
38	>	assertEquals(1, l.getCount());
39		}
40
41		/**
42		* countDown decrements count when positive and has no effect when zero
43		*/
44		public void testCountDown() {
45	<	final CountDownLatch l = new CountDownLatch(1);
46	<	assertEquals(1, l.getCount());
47	<	l.countDown();
48	<	assertEquals(0, l.getCount());
49	<	l.countDown();
50	<	assertEquals(0, l.getCount());
45	>	final CountDownLatch l = new CountDownLatch(1);
46	>	assertEquals(1, l.getCount());
47	>	l.countDown();
48	>	assertEquals(0, l.getCount());
49	>	l.countDown();
50	>	assertEquals(0, l.getCount());
51		}
52
53		/**
54		* await returns after countDown to zero, but not before
55		*/
56		public void testAwait() {
57	<	final CountDownLatch l = new CountDownLatch(2);
57	>	final CountDownLatch l = new CountDownLatch(2);
58
59	<	Thread t = new Thread(new Runnable() {
60	<	public void run() {
61	<	try {
59	>	Thread t = new Thread(new Runnable() {
60	>	public void run() {
61	>	try {
62		threadAssertTrue(l.getCount() > 0);
63	<	l.await();
63	>	l.await();
64		threadAssertTrue(l.getCount() == 0);
65	<	} catch (InterruptedException e) {
65	>	} catch (InterruptedException e) {
66		threadUnexpectedException();
67		}
68	<	}
69	<	});
70	<	t.start();
71	<	try {
68	>	}
69	>	});
70	>	t.start();
71	>	try {
72		assertEquals(l.getCount(), 2);
73		Thread.sleep(SHORT_DELAY_MS);
74		l.countDown();
#	Line 86 | Line 86 | public class CountDownLatchTest extends
86		* timed await returns after countDown to zero
87		*/
88		public void testTimedAwait() {
89	<	final CountDownLatch l = new CountDownLatch(2);
89	>	final CountDownLatch l = new CountDownLatch(2);
90
91	<	Thread t = new Thread(new Runnable() {
92	<	public void run() {
93	<	try {
91	>	Thread t = new Thread(new Runnable() {
92	>	public void run() {
93	>	try {
94		threadAssertTrue(l.getCount() > 0);
95	<	threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS));
96	<	} catch (InterruptedException e) {
95	>	threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS));
96	>	} catch (InterruptedException e) {
97		threadUnexpectedException();
98		}
99	<	}
100	<	});
101	<	t.start();
102	<	try {
99	>	}
100	>	});
101	>	t.start();
102	>	try {
103		assertEquals(l.getCount(), 2);
104		Thread.sleep(SHORT_DELAY_MS);
105		l.countDown();
#	Line 126 | Line 126 | public class CountDownLatchTest extends
126		} catch (InterruptedException success) {}
127		}
128		});
129	<	t.start();
130	<	try {
129	>	t.start();
130	>	try {
131		assertEquals(l.getCount(), 1);
132		t.interrupt();
133		t.join();

Diff Legend

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