Merge branch 'benjumanji-single-thread-ultimately' into 3.1.x

Author: bvenners

.jvmopts

@@ -5,4 +5,5 @@
 -XX:+CMSClassUnloadingEnabled 
 -XX:+UseConcMarkSweepGC 
 -XX:+CMSIncrementalMode 
--XX:NewRatio=8 -XX:MaxPermSize=512M
+-XX:NewRatio=8
+-XX:MaxPermSize=512M

scalatest-test/src/test/scala/org/scalatest/concurrent/UltimatelySpec.scala

@@ -201,7 +201,7 @@ class UltimatelySpec extends AsyncFunSpec with Matchers with OptionValues {
           } 
         } 
       } map { _ =>
-        (System.currentTimeMillis - startTime.get).toInt should be >= (1388)
+        (System.currentTimeMillis - startTime.get).toInt should be >= (1388 - 10) // - 10 to give it a little wiggle room
       }
     }
 

scalatest/src/main/scala/org/scalatest/concurrent/Ultimately.scala

@@ -25,6 +25,8 @@ import org.scalactic.source
 import org.scalatest.exceptions.StackDepthException
 import scala.concurrent.{Future, Promise, ExecutionContext}
 import scala.util.{Success, Failure}
+import java.util.concurrent.{ Executors, TimeUnit, ThreadFactory }
+import java.util.concurrent.ScheduledExecutorService
 
 /**
  * Trait that provides the <code>ultimately</code> construct, which periodically retries executing
@@ -280,6 +282,8 @@ import scala.util.{Success, Failure}
  */
 trait Ultimately extends PatienceConfiguration {
 
+
+
   /**
    * Invokes the passed by-name parameter repeatedly until it either succeeds, or a configured maximum
    * amount of time has passed, sleeping a configured interval between attempts.
@@ -427,7 +431,7 @@ trait Ultimately extends PatienceConfiguration {
             val promise = Promise[T]
 
             val task =
-              new TimerTask {
+              new Runnable {
                 override def run(): Unit = {
                   val newFut = tryTryAgain(attempt + 1)
                   newFut onComplete {
@@ -437,8 +441,7 @@ trait Ultimately extends PatienceConfiguration {
                 }
               }
 
-            val timer = new Timer
-            timer.schedule(task, chillTime)
+            Ultimately.scheduler.schedule(task, chillTime, TimeUnit.MILLISECONDS)
             promise.future
           }
           else { // Timed out so return a failed Future
@@ -501,4 +504,17 @@ trait Ultimately extends PatienceConfiguration {
  *   ...
  * </pre>
  */
-object Ultimately extends Ultimately
+object Ultimately extends Ultimately {
+  private lazy val scheduler: ScheduledExecutorService = {
+    val threadFactory = new ThreadFactory {
+      val inner = Executors.defaultThreadFactory()
+      def newThread(runnable: Runnable) = {
+        val thread = inner.newThread(runnable)
+        thread.setDaemon(true)
+        thread
+      }
+    }
+
+    Executors.newSingleThreadScheduledExecutor(threadFactory)
+  }
+}