ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/JSR166TestCase.java
(Generate patch)

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.119 by jsr166, Mon Jun 16 20:13:54 2014 UTC vs.
Revision 1.126 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 >
12   import java.io.ByteArrayInputStream;
13   import java.io.ByteArrayOutputStream;
14   import java.io.ObjectInputStream;
# Line 14 | Line 16 | import java.io.ObjectOutputStream;
16   import java.lang.management.ManagementFactory;
17   import java.lang.management.ThreadInfo;
18   import java.lang.reflect.Method;
19 + import java.security.CodeSource;
20 + import java.security.Permission;
21 + import java.security.PermissionCollection;
22 + import java.security.Permissions;
23 + import java.security.Policy;
24 + import java.security.ProtectionDomain;
25 + import java.security.SecurityPermission;
26   import java.util.ArrayList;
27   import java.util.Arrays;
28   import java.util.Date;
29   import java.util.Enumeration;
30 + import java.util.Iterator;
31   import java.util.List;
32   import java.util.NoSuchElementException;
33   import java.util.PropertyPermission;
34 < import java.util.concurrent.*;
35 < import java.util.concurrent.atomic.AtomicBoolean;
34 > import java.util.concurrent.BlockingQueue;
35 > import java.util.concurrent.Callable;
36 > import java.util.concurrent.CountDownLatch;
37 > import java.util.concurrent.CyclicBarrier;
38 > import java.util.concurrent.ExecutorService;
39 > import java.util.concurrent.Future;
40 > import java.util.concurrent.RecursiveAction;
41 > import java.util.concurrent.RecursiveTask;
42 > import java.util.concurrent.RejectedExecutionHandler;
43 > import java.util.concurrent.Semaphore;
44 > import java.util.concurrent.ThreadFactory;
45 > import java.util.concurrent.ThreadPoolExecutor;
46 > import java.util.concurrent.TimeoutException;
47   import java.util.concurrent.atomic.AtomicReference;
27 – import static java.util.concurrent.TimeUnit.MILLISECONDS;
28 – import static java.util.concurrent.TimeUnit.NANOSECONDS;
48   import java.util.regex.Pattern;
49 < import java.security.CodeSource;
50 < import java.security.Permission;
51 < import java.security.PermissionCollection;
52 < import java.security.Permissions;
53 < import java.security.Policy;
35 < import java.security.ProtectionDomain;
36 < import java.security.SecurityPermission;
49 >
50 > import junit.framework.AssertionFailedError;
51 > import junit.framework.Test;
52 > import junit.framework.TestCase;
53 > import junit.framework.TestSuite;
54  
55   /**
56   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 449 | Line 466 | public class JSR166TestCase extends Test
466      }
467  
468      /**
469 <     * Find missing try { ... } finally { joinPool(e); }
469 >     * Finds missing try { ... } finally { joinPool(e); }
470       */
471      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
472          Thread[] survivors = new Thread[5];
# Line 630 | Line 647 | public class JSR166TestCase extends Test
647      void joinPool(ExecutorService exec) {
648          try {
649              exec.shutdown();
650 <            assertTrue("ExecutorService did not terminate in a timely manner",
651 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
650 >            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
651 >                fail("ExecutorService " + exec +
652 >                     " did not terminate in a timely manner");
653          } catch (SecurityException ok) {
654              // Allowed in case test doesn't have privs
655          } catch (InterruptedException ie) {
# Line 907 | Line 925 | public class JSR166TestCase extends Test
925      /**
926       * Returns the number of milliseconds since time given by
927       * startNanoTime, which must have been previously returned from a
928 <     * call to {@link System.nanoTime()}.
928 >     * call to {@link System#nanoTime()}.
929       */
930      static long millisElapsedSince(long startNanoTime) {
931          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
932      }
933  
934 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
935 + //         long startTime = System.nanoTime();
936 + //         try {
937 + //             r.run();
938 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
939 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
940 + //             throw new AssertionFailedError("did not return promptly");
941 + //     }
942 +
943 + //     void assertTerminatesPromptly(Runnable r) {
944 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
945 + //     }
946 +
947 +    /**
948 +     * Checks that timed f.get() returns the expected value, and does not
949 +     * wait for the timeout to elapse before returning.
950 +     */
951 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
952 +        long startTime = System.nanoTime();
953 +        try {
954 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
955 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
956 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
957 +            throw new AssertionFailedError("timed get did not return promptly");
958 +    }
959 +
960 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
961 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
962 +    }
963 +
964      /**
965       * Returns a new started daemon Thread running the given runnable.
966       */
# Line 1421 | Line 1469 | public class JSR166TestCase extends Test
1469                  shouldThrow(expectedExceptionClass.getName());
1470          }
1471      }
1472 +
1473 +    public void assertIteratorExhausted(Iterator<?> it) {
1474 +        try {
1475 +            it.next();
1476 +            shouldThrow();
1477 +        } catch (NoSuchElementException success) {}
1478 +        assertFalse(it.hasNext());
1479 +    }        
1480   }

Diff Legend

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