--- jsr166/src/test/tck/CountDownLatchTest.java	2009/11/16 04:57:10	1.9
+++ jsr166/src/test/tck/CountDownLatchTest.java	2014/12/31 19:05:42	1.22
@@ -1,21 +1,24 @@
 /*
  * 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
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * 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;
+
+import java.util.concurrent.CountDownLatch;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 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);
     }
 
     /**
@@ -25,165 +28,157 @@ 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 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());
+        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);
+        final CountDownLatch pleaseCountDown = new CountDownLatch(1);
 
-	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 {
-            assertEquals(l.getCount(), 2);
-            Thread.sleep(SHORT_DELAY_MS);
-            l.countDown();
-            assertEquals(l.getCount(), 1);
-            l.countDown();
-            assertEquals(l.getCount(), 0);
-            t.join();
-        } catch (InterruptedException e){
-            unexpectedException();
-        }
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                assertEquals(2, l.getCount());
+                pleaseCountDown.countDown();
+                l.await();
+                assertEquals(0, l.getCount());
+            }});
+
+        await(pleaseCountDown);
+        assertEquals(2, l.getCount());
+        l.countDown();
+        assertEquals(1, l.getCount());
+        assertThreadStaysAlive(t);
+        l.countDown();
+        assertEquals(0, l.getCount());
+        awaitTermination(t);
     }
 
-
     /**
      * timed await returns after countDown to zero
      */
     public void testTimedAwait() {
-	final CountDownLatch l = new CountDownLatch(2);
+        final CountDownLatch l = new CountDownLatch(2);
+        final CountDownLatch pleaseCountDown = new CountDownLatch(1);
 
-	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){
-                        threadUnexpectedException();
-                    }
-		}
-	    });
-	t.start();
-	try {
-            assertEquals(l.getCount(), 2);
-            Thread.sleep(SHORT_DELAY_MS);
-            l.countDown();
-            assertEquals(l.getCount(), 1);
-            l.countDown();
-            assertEquals(l.getCount(), 0);
-            t.join();
-        } catch (InterruptedException e){
-            unexpectedException();
-        }
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                assertEquals(2, l.getCount());
+                pleaseCountDown.countDown();
+                assertTrue(l.await(LONG_DELAY_MS, MILLISECONDS));
+                assertEquals(0, l.getCount());
+            }});
+
+        await(pleaseCountDown);
+        assertEquals(2, l.getCount());
+        l.countDown();
+        assertEquals(1, l.getCount());
+        assertThreadStaysAlive(t);
+        l.countDown();
+        assertEquals(0, l.getCount());
+        awaitTermination(t);
     }
 
     /**
      * await throws IE if interrupted before counted down
      */
-    public void testAwait_InterruptedException() {
+    public void testAwait_Interruptible() {
         final CountDownLatch l = new CountDownLatch(1);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        threadAssertTrue(l.getCount() > 0);
-                        l.await();
-                        threadShouldThrow();
-                    } catch (InterruptedException success){}
-                }
-            });
-	t.start();
-	try {
-            assertEquals(l.getCount(), 1);
-            t.interrupt();
-            t.join();
-        } catch (InterruptedException e){
-            unexpectedException();
-        }
+        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.currentThread().interrupt();
+                try {
+                    l.await();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                pleaseInterrupt.countDown();
+                try {
+                    l.await();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                assertEquals(1, l.getCount());
+            }});
+
+        await(pleaseInterrupt);
+        assertThreadStaysAlive(t);
+        t.interrupt();
+        awaitTermination(t);
     }
 
     /**
      * timed await throws IE if interrupted before counted down
      */
-    public void testTimedAwait_InterruptedException() {
+    public void testTimedAwait_Interruptible() {
         final CountDownLatch l = new CountDownLatch(1);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        threadAssertTrue(l.getCount() > 0);
-                        l.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
-                        threadShouldThrow();
-                    } catch (InterruptedException success){}
-                }
-            });
-        t.start();
-        try {
-            Thread.sleep(SHORT_DELAY_MS);
-            assertEquals(l.getCount(), 1);
-            t.interrupt();
-            t.join();
-        } catch (InterruptedException e){
-            unexpectedException();
-        }
+        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.currentThread().interrupt();
+                try {
+                    l.await(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                pleaseInterrupt.countDown();
+                try {
+                    l.await(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                assertEquals(1, l.getCount());
+            }});
+
+        await(pleaseInterrupt);
+        assertThreadStaysAlive(t);
+        t.interrupt();
+        awaitTermination(t);
     }
 
     /**
      * timed await times out if not counted down before timeout
      */
-    public void testAwaitTimeout() {
+    public void testAwaitTimeout() throws InterruptedException {
         final CountDownLatch l = new CountDownLatch(1);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        threadAssertTrue(l.getCount() > 0);
-                        threadAssertFalse(l.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
-                        threadAssertTrue(l.getCount() > 0);
-                    } catch (InterruptedException ie){
-                        threadUnexpectedException();
-                    }
-                }
-            });
-        t.start();
-        try {
-            assertEquals(l.getCount(), 1);
-            t.join();
-        } catch (InterruptedException e){
-            unexpectedException();
-        }
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                assertEquals(1, l.getCount());
+                assertFalse(l.await(timeoutMillis(), MILLISECONDS));
+                assertEquals(1, l.getCount());
+            }});
+
+        awaitTermination(t);
+        assertEquals(1, l.getCount());
     }
 
     /**
@@ -191,14 +186,11 @@ public class CountDownLatchTest extends
      */
     public void testToString() {
         CountDownLatch s = new CountDownLatch(2);
-        String us = s.toString();
-        assertTrue(us.indexOf("Count = 2") >= 0);
+        assertTrue(s.toString().contains("Count = 2"));
         s.countDown();
-        String s1 = s.toString();
-        assertTrue(s1.indexOf("Count = 1") >= 0);
+        assertTrue(s.toString().contains("Count = 1"));
         s.countDown();
-        String s2 = s.toString();
-        assertTrue(s2.indexOf("Count = 0") >= 0);
+        assertTrue(s.toString().contains("Count = 0"));
     }
 
 }