test/jdk/java/util/concurrent/tck/ExecutorsTest.java

8234131: Miscellaneous changes imported from jsr166 CVS 2021-01
Reviewed-by: martin

*** 88,98 ****
      /**
       * A newCachedThreadPool with null ThreadFactory throws NPE
       */
      public void testNewCachedThreadPool3() {
          try {
!             ExecutorService e = Executors.newCachedThreadPool(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
--- 88,98 ----
      /**
       * A newCachedThreadPool with null ThreadFactory throws NPE
       */
      public void testNewCachedThreadPool3() {
          try {
!             ExecutorService unused = Executors.newCachedThreadPool(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
*** 122,132 ****
      /**
       * A new SingleThreadExecutor with null ThreadFactory throws NPE
       */
      public void testNewSingleThreadExecutor3() {
          try {
!             ExecutorService e = Executors.newSingleThreadExecutor(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
--- 122,132 ----
      /**
       * A new SingleThreadExecutor with null ThreadFactory throws NPE
       */
      public void testNewSingleThreadExecutor3() {
          try {
!             ExecutorService unused = Executors.newSingleThreadExecutor(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
*** 170,190 ****
       * A new newFixedThreadPool with null ThreadFactory throws
       * NullPointerException
       */
      public void testNewFixedThreadPool3() {
          try {
!             ExecutorService e = Executors.newFixedThreadPool(2, null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * A new newFixedThreadPool with 0 threads throws IllegalArgumentException
       */
      public void testNewFixedThreadPool4() {
          try {
!             ExecutorService e = Executors.newFixedThreadPool(0);
              shouldThrow();
          } catch (IllegalArgumentException success) {}
      }
  
      /**
--- 170,190 ----
       * A new newFixedThreadPool with null ThreadFactory throws
       * NullPointerException
       */
      public void testNewFixedThreadPool3() {
          try {
!             ExecutorService unused = Executors.newFixedThreadPool(2, null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * A new newFixedThreadPool with 0 threads throws IllegalArgumentException
       */
      public void testNewFixedThreadPool4() {
          try {
!             ExecutorService unused = Executors.newFixedThreadPool(0);
              shouldThrow();
          } catch (IllegalArgumentException success) {}
      }
  
      /**
*** 202,222 ****
      /**
       * unconfigurableExecutorService(null) throws NPE
       */
      public void testUnconfigurableExecutorServiceNPE() {
          try {
!             ExecutorService e = Executors.unconfigurableExecutorService(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * unconfigurableScheduledExecutorService(null) throws NPE
       */
      public void testUnconfigurableScheduledExecutorServiceNPE() {
          try {
!             ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
--- 202,224 ----
      /**
       * unconfigurableExecutorService(null) throws NPE
       */
      public void testUnconfigurableExecutorServiceNPE() {
          try {
!             ExecutorService unused =
!                 Executors.unconfigurableExecutorService(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * unconfigurableScheduledExecutorService(null) throws NPE
       */
      public void testUnconfigurableScheduledExecutorServiceNPE() {
          try {
!             ExecutorService unused =
!                 Executors.unconfigurableScheduledExecutorService(null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
*** 302,314 ****
              Executors.newCachedThreadPool(),
              Executors.newFixedThreadPool(2),
              Executors.newScheduledThreadPool(2),
          };
  
!         final Runnable sleeper = new CheckedInterruptedRunnable() {
              public void realRun() throws InterruptedException {
!                 delay(LONG_DELAY_MS);
              }};
  
          List<Thread> threads = new ArrayList<>();
          for (final ExecutorService executor : executors) {
              threads.add(newStartedThread(new CheckedRunnable() {
--- 304,318 ----
              Executors.newCachedThreadPool(),
              Executors.newFixedThreadPool(2),
              Executors.newScheduledThreadPool(2),
          };
  
!         final CountDownLatch done = new CountDownLatch(1);
! 
!         final Runnable sleeper = new CheckedRunnable() {
              public void realRun() throws InterruptedException {
!                 done.await(LONG_DELAY_MS, MILLISECONDS);
              }};
  
          List<Thread> threads = new ArrayList<>();
          for (final ExecutorService executor : executors) {
              threads.add(newStartedThread(new CheckedRunnable() {
*** 317,326 ****
--- 321,331 ----
                      assertFutureTimesOut(future);
                  }}));
          }
          for (Thread thread : threads)
              awaitTermination(thread);
+         done.countDown();
          for (ExecutorService executor : executors)
              joinPool(executor);
      }
  
      /**
*** 576,616 ****
      /**
       * callable(null Runnable) throws NPE
       */
      public void testCallableNPE1() {
          try {
!             Callable c = Executors.callable((Runnable) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null, result) throws NPE
       */
      public void testCallableNPE2() {
          try {
!             Callable c = Executors.callable((Runnable) null, one);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null PrivilegedAction) throws NPE
       */
      public void testCallableNPE3() {
          try {
!             Callable c = Executors.callable((PrivilegedAction) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null PrivilegedExceptionAction) throws NPE
       */
      public void testCallableNPE4() {
          try {
!             Callable c = Executors.callable((PrivilegedExceptionAction) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
--- 581,621 ----
      /**
       * callable(null Runnable) throws NPE
       */
      public void testCallableNPE1() {
          try {
!             Callable unused = Executors.callable((Runnable) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null, result) throws NPE
       */
      public void testCallableNPE2() {
          try {
!             Callable unused = Executors.callable((Runnable) null, one);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null PrivilegedAction) throws NPE
       */
      public void testCallableNPE3() {
          try {
!             Callable unused = Executors.callable((PrivilegedAction) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**
       * callable(null PrivilegedExceptionAction) throws NPE
       */
      public void testCallableNPE4() {
          try {
!             Callable unused = Executors.callable((PrivilegedExceptionAction) null);
              shouldThrow();
          } catch (NullPointerException success) {}
      }
  
      /**