--- jsr166/src/test/tck/CountDownLatchTest.java 2003/09/14 20:42:40 1.2 +++ jsr166/src/test/tck/CountDownLatchTest.java 2009/11/21 02:33:20 1.12 @@ -1,50 +1,75 @@ /* - * Written by members of JCP JSR-166 Expert Group and released to the - * public domain. Use, modify, and redistribute this code in any way - * without acknowledgement. Other contributors include Andrew Wright, - * Jeffrey Hayes, Pat Fischer, Mike Judd. + * Written by Doug Lea with assistance from members of JCP JSR-166 + * Expert Group and released to the public domain, as explained at + * http://creativecommons.org/licenses/publicdomain + * Other contributors include Andrew Wright, Jeffrey Hayes, + * Pat Fisher, Mike Judd. */ import junit.framework.*; import java.util.*; import java.util.concurrent.*; +import static java.util.concurrent.TimeUnit.MILLISECONDS; public class CountDownLatchTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { - return new TestSuite(CountDownLatchTest.class); + return new TestSuite(CountDownLatchTest.class); } - public void testConstructor(){ + /** + * negative constructor argument throws IAE + */ + public void testConstructor() { try { new CountDownLatch(-1); - fail("should throw IllegalArgumentException"); - } catch(IllegalArgumentException success){} + shouldThrow(); + } catch (IllegalArgumentException success) {} } - public void testGetCount(){ - final CountDownLatch l = new CountDownLatch(2); - assertEquals(2, l.getCount()); - l.countDown(); - assertEquals(1, l.getCount()); - } - - public void testAwait(){ - final CountDownLatch l = new CountDownLatch(2); - - Thread t = new Thread(new Runnable(){ - public void run(){ - try { - l.await(); - } catch(InterruptedException e){ - threadFail("unexpected exception"); + /** + * getCount returns initial count and decreases after countDown + */ + public void testGetCount() { + final CountDownLatch l = new CountDownLatch(2); + assertEquals(2, l.getCount()); + l.countDown(); + assertEquals(1, l.getCount()); + } + + /** + * countDown decrements count when positive and has no effect when zero + */ + public void testCountDown() { + final CountDownLatch l = new CountDownLatch(1); + assertEquals(1, l.getCount()); + l.countDown(); + assertEquals(0, l.getCount()); + l.countDown(); + assertEquals(0, l.getCount()); + } + + /** + * await returns after countDown to zero, but not before + */ + public void testAwait() { + final CountDownLatch l = new CountDownLatch(2); + + Thread t = new Thread(new Runnable() { + public void run() { + try { + threadAssertTrue(l.getCount() > 0); + l.await(); + threadAssertTrue(l.getCount() == 0); + } catch (InterruptedException e) { + threadUnexpectedException(); } - } - }); - t.start(); - try { + } + }); + t.start(); + try { assertEquals(l.getCount(), 2); Thread.sleep(SHORT_DELAY_MS); l.countDown(); @@ -52,26 +77,30 @@ public class CountDownLatchTest extends l.countDown(); assertEquals(l.getCount(), 0); t.join(); - } catch (InterruptedException e){ - fail("unexpected exception"); + } catch (InterruptedException e) { + unexpectedException(); } } - - public void testTimedAwait(){ - final CountDownLatch l = new CountDownLatch(2); - Thread t = new Thread(new Runnable(){ - public void run(){ - try { - threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS)); - } catch(InterruptedException e){ - threadFail("unexpected exception"); + /** + * timed await returns after countDown to zero + */ + public void testTimedAwait() { + final CountDownLatch l = new CountDownLatch(2); + + Thread t = new Thread(new Runnable() { + public void run() { + try { + threadAssertTrue(l.getCount() > 0); + threadAssertTrue(l.await(SMALL_DELAY_MS, MILLISECONDS)); + } catch (InterruptedException e) { + threadUnexpectedException(); } - } - }); - t.start(); - try { + } + }); + t.start(); + try { assertEquals(l.getCount(), 2); Thread.sleep(SHORT_DELAY_MS); l.countDown(); @@ -79,42 +108,47 @@ public class CountDownLatchTest extends l.countDown(); assertEquals(l.getCount(), 0); t.join(); - } catch (InterruptedException e){ - fail("unexpected exception"); + } catch (InterruptedException e) { + unexpectedException(); } } - - - - public void testAwait_InterruptedException(){ + /** + * await throws IE if interrupted before counted down + */ + public void testAwait_InterruptedException() { final CountDownLatch l = new CountDownLatch(1); - Thread t = new Thread(new Runnable(){ - public void run(){ + Thread t = new Thread(new Runnable() { + public void run() { try { + threadAssertTrue(l.getCount() > 0); l.await(); - threadFail("should throw"); - } catch(InterruptedException success){} + threadShouldThrow(); + } catch (InterruptedException success) {} } }); - t.start(); - try { + t.start(); + try { assertEquals(l.getCount(), 1); t.interrupt(); t.join(); - } catch (InterruptedException e){ - fail("unexpected exception"); + } catch (InterruptedException e) { + unexpectedException(); } } - public void testTimedAwait_InterruptedException(){ + /** + * timed await throws IE if interrupted before counted down + */ + public void testTimedAwait_InterruptedException() { final CountDownLatch l = new CountDownLatch(1); - Thread t = new Thread(new Runnable(){ - public void run(){ + Thread t = new Thread(new Runnable() { + public void run() { try { - l.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); - threadFail("should throw"); - } catch(InterruptedException success){} + threadAssertTrue(l.getCount() > 0); + l.await(MEDIUM_DELAY_MS, MILLISECONDS); + threadShouldThrow(); + } catch (InterruptedException success) {} } }); t.start(); @@ -123,19 +157,24 @@ public class CountDownLatchTest extends assertEquals(l.getCount(), 1); t.interrupt(); t.join(); - } catch (InterruptedException e){ - fail("unexpected exception"); + } catch (InterruptedException e) { + unexpectedException(); } } - public void testAwaitTimeout(){ + /** + * timed await times out if not counted down before timeout + */ + public void testAwaitTimeout() { final CountDownLatch l = new CountDownLatch(1); - Thread t = new Thread(new Runnable(){ - public void run(){ + Thread t = new Thread(new Runnable() { + public void run() { try { - threadAssertFalse(l.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); - } catch(InterruptedException ie){ - threadFail("unexpected exception"); + threadAssertTrue(l.getCount() > 0); + threadAssertFalse(l.await(SHORT_DELAY_MS, MILLISECONDS)); + threadAssertTrue(l.getCount() > 0); + } catch (InterruptedException ie) { + threadUnexpectedException(); } } }); @@ -143,9 +182,24 @@ public class CountDownLatchTest extends try { assertEquals(l.getCount(), 1); t.join(); - } catch (InterruptedException e){ - fail("unexpected exception"); + } catch (InterruptedException e) { + unexpectedException(); } } + /** + * toString indicates current count + */ + public void testToString() { + CountDownLatch s = new CountDownLatch(2); + String us = s.toString(); + assertTrue(us.indexOf("Count = 2") >= 0); + s.countDown(); + String s1 = s.toString(); + assertTrue(s1.indexOf("Count = 1") >= 0); + s.countDown(); + String s2 = s.toString(); + assertTrue(s2.indexOf("Count = 0") >= 0); + } + }