test/jdk/java/util/concurrent/TimeUnit/Basic.java

8225490: Miscellaneous changes imported from jsr166 CVS 2019-09
Reviewed-by: martin, alanb

*** 22,31 ****
--- 22,32 ----
   */
  
  /* @test
   * @bug 5057341 6363898
   * @summary Basic tests for TimeUnit
+  * @library /test/lib
   * @author Martin Buchholz
   */
  
  import static java.util.concurrent.TimeUnit.DAYS;
  import static java.util.concurrent.TimeUnit.HOURS;
*** 37,52 ****
--- 38,61 ----
  
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.IOException;
  import java.io.InputStream;
+ import java.util.List;
  import java.io.ObjectOutputStream;
  import java.io.ObjectInputStream;
  import java.util.Arrays;
+ import java.util.concurrent.CompletableFuture;
+ import java.util.concurrent.ThreadLocalRandom;
  import java.util.concurrent.TimeUnit;
+ import java.util.stream.Collectors;
+ import java.util.stream.IntStream;
+ import jdk.test.lib.Utils;
  
  public class Basic {
+     static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
+ 
      private static void realMain(String[] args) throws Throwable {
  
          for (TimeUnit u : TimeUnit.values()) {
              System.out.println(u);
              check(u instanceof TimeUnit);
*** 69,90 ****
          equal(  60L, MINUTES.toSeconds(1));
          equal(1000L, SECONDS.toMillis(1));
          equal(1000L, MILLISECONDS.toMicros(1));
          equal(1000L, MICROSECONDS.toNanos(1));
  
!         long t0 = System.nanoTime();
!         MILLISECONDS.sleep(3); /* See windows bug 6313903, might not sleep */
!         long elapsedMillis = (System.nanoTime() - t0)/(1000L * 1000L);
!         System.out.printf("elapsed=%d%n", elapsedMillis);
!         check(elapsedMillis >= 0);
!         /* Might not sleep on windows: check(elapsedMillis >= 3); */
!         check(elapsedMillis < 1000);
  
          //----------------------------------------------------------------
          // Tests for serialized form compatibility with previous release
          //----------------------------------------------------------------
!         byte[] serializedForm = /* Generated using tiger */
              {-84, -19, 0, 5, '~', 'r', 0, 29, 'j', 'a', 'v', 'a', '.',
               'u', 't', 'i', 'l', '.', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e',
               'n', 't', '.', 'T', 'i', 'm', 'e', 'U', 'n', 'i', 't', 0, 0,
               0, 0, 0, 0, 0, 0, 18, 0, 0, 'x', 'r', 0, 14,
               'j', 'a', 'v', 'a', '.', 'l', 'a', 'n', 'g', '.', 'E', 'n', 'u',
--- 78,114 ----
          equal(  60L, MINUTES.toSeconds(1));
          equal(1000L, SECONDS.toMillis(1));
          equal(1000L, MILLISECONDS.toMicros(1));
          equal(1000L, MICROSECONDS.toNanos(1));
  
!         //----------------------------------------------------------------
!         // TimeUnit.sleep sleeps for at least the specified time.
!         // TimeUnit.sleep(x, unit) for x <= 0 does not sleep at all.
!         //----------------------------------------------------------------
!         ThreadLocalRandom rnd = ThreadLocalRandom.current();
!         int maxTimeoutMillis = rnd.nextInt(1, 12);
!         List<CompletableFuture<?>> workers =
!             IntStream.range(-1, maxTimeoutMillis + 1)
!             .mapToObj(timeoutMillis -> (Runnable) () -> {
!                 try {
!                     long startTime = System.nanoTime();
!                     MILLISECONDS.sleep(timeoutMillis);
!                     long elapsedNanos = System.nanoTime() - startTime;
!                     long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
!                     check(elapsedNanos >= timeoutNanos);
!                 } catch (InterruptedException fail) {
!                     throw new AssertionError(fail);
!                 }})
!             .map(CompletableFuture::runAsync)
!             .collect(Collectors.toList());
! 
!         workers.forEach(CompletableFuture<?>::join);
  
          //----------------------------------------------------------------
          // Tests for serialized form compatibility with previous release
          //----------------------------------------------------------------
!         byte[] serializedForm = /* Generated using JDK 5 */
              {-84, -19, 0, 5, '~', 'r', 0, 29, 'j', 'a', 'v', 'a', '.',
               'u', 't', 'i', 'l', '.', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e',
               'n', 't', '.', 'T', 'i', 'm', 'e', 'U', 'n', 'i', 't', 0, 0,
               0, 0, 0, 0, 0, 0, 18, 0, 0, 'x', 'r', 0, 14,
               'j', 'a', 'v', 'a', '.', 'l', 'a', 'n', 'g', '.', 'E', 'n', 'u',