--- jsr166/src/test/tck/CountDownLatchTest.java	2003/09/25 11:02:41	1.4
+++ jsr166/src/test/tck/CountDownLatchTest.java	2009/11/21 02:07:26	1.11
@@ -1,8 +1,9 @@
 /*
- * 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.*;
@@ -11,10 +12,10 @@ import java.util.concurrent.*;
 
 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);
     }
 
     /**
@@ -24,50 +25,50 @@ public class CountDownLatchTest extends
         try {
             new CountDownLatch(-1);
             shouldThrow();
-        } catch(IllegalArgumentException success){}
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
      * 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());
+        final CountDownLatch l = new CountDownLatch(2);
+        assertEquals(2, l.getCount());
+        l.countDown();
+        assertEquals(1, l.getCount());
     }
 
     /**
-     * countDown has no effect when count is 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());
+     * 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);
+        final CountDownLatch l = new CountDownLatch(2);
 
-	Thread t = new Thread(new Runnable() {
-		public void run() {
-		    try {
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    try {
                         threadAssertTrue(l.getCount() > 0);
-			l.await();
+                        l.await();
                         threadAssertTrue(l.getCount() == 0);
-		    } catch(InterruptedException e){
+                    } catch (InterruptedException e) {
                         threadUnexpectedException();
                     }
-		}
-	    });
-	t.start();
-	try {
+                }
+            });
+        t.start();
+        try {
             assertEquals(l.getCount(), 2);
             Thread.sleep(SHORT_DELAY_MS);
             l.countDown();
@@ -75,30 +76,30 @@ public class CountDownLatchTest extends
             l.countDown();
             assertEquals(l.getCount(), 0);
             t.join();
-        } catch (InterruptedException e){
+        } catch (InterruptedException e) {
             unexpectedException();
         }
     }
-    
+
 
     /**
      * timed await returns after countDown to zero
      */
     public void testTimedAwait() {
-	final CountDownLatch l = new CountDownLatch(2);
+        final CountDownLatch l = new CountDownLatch(2);
 
-	Thread t = new Thread(new Runnable() {
-		public void run() {
-		    try {
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    try {
                         threadAssertTrue(l.getCount() > 0);
-			threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS));
-		    } catch(InterruptedException e){
+                        threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS));
+                    } catch (InterruptedException e) {
                         threadUnexpectedException();
                     }
-		}
-	    });
-	t.start();
-	try {
+                }
+            });
+        t.start();
+        try {
             assertEquals(l.getCount(), 2);
             Thread.sleep(SHORT_DELAY_MS);
             l.countDown();
@@ -106,13 +107,13 @@ public class CountDownLatchTest extends
             l.countDown();
             assertEquals(l.getCount(), 0);
             t.join();
-        } catch (InterruptedException e){
+        } catch (InterruptedException e) {
             unexpectedException();
         }
     }
-    
+
     /**
-     * await throws IE ig interrupted before counted down
+     * await throws IE if interrupted before counted down
      */
     public void testAwait_InterruptedException() {
         final CountDownLatch l = new CountDownLatch(1);
@@ -122,21 +123,21 @@ public class CountDownLatchTest extends
                         threadAssertTrue(l.getCount() > 0);
                         l.await();
                         threadShouldThrow();
-                    } catch(InterruptedException success){}
+                    } catch (InterruptedException success) {}
                 }
             });
-	t.start();
-	try {
+        t.start();
+        try {
             assertEquals(l.getCount(), 1);
             t.interrupt();
             t.join();
-        } catch (InterruptedException e){
+        } catch (InterruptedException e) {
             unexpectedException();
         }
     }
 
     /**
-     * timed await throws IE ig interrupted before counted down
+     * timed await throws IE if interrupted before counted down
      */
     public void testTimedAwait_InterruptedException() {
         final CountDownLatch l = new CountDownLatch(1);
@@ -145,8 +146,8 @@ public class CountDownLatchTest extends
                     try {
                         threadAssertTrue(l.getCount() > 0);
                         l.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
-                        threadShouldThrow();                        
-                    } catch(InterruptedException success){}
+                        threadShouldThrow();
+                    } catch (InterruptedException success) {}
                 }
             });
         t.start();
@@ -155,7 +156,7 @@ public class CountDownLatchTest extends
             assertEquals(l.getCount(), 1);
             t.interrupt();
             t.join();
-        } catch (InterruptedException e){
+        } catch (InterruptedException e) {
             unexpectedException();
         }
     }
@@ -171,7 +172,7 @@ public class CountDownLatchTest extends
                         threadAssertTrue(l.getCount() > 0);
                         threadAssertFalse(l.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
                         threadAssertTrue(l.getCount() > 0);
-                    } catch(InterruptedException ie){
+                    } catch (InterruptedException ie) {
                         threadUnexpectedException();
                     }
                 }
@@ -180,9 +181,24 @@ public class CountDownLatchTest extends
         try {
             assertEquals(l.getCount(), 1);
             t.join();
-        } catch (InterruptedException e){
+        } 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);
+    }
+
 }