Factor helper method in tests

Author: alexarchambault

modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala

@@ -3,8 +3,8 @@ package scala.cli.integration
 import com.eed3si9n.expecty.Expecty.expect
 
 import scala.cli.integration.util.BloopUtil
+import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, ExecutionContext, Future}
 
 class BloopTests extends ScalaCliSuite {
 
@@ -144,13 +144,8 @@ class BloopTests extends ScalaCliSuite {
   test("Restart Bloop server while watching") {
     TestUtil.withThreadPool("bloop-restart-test", 2) { pool =>
       val timeout = Duration("20 seconds")
-      def readLine(stream: os.SubProcess.OutputStream): String = {
-        implicit val ec = ExecutionContext.fromExecutorService(pool)
-        val readLineF = Future {
-          stream.readLine()
-        }
-        Await.result(readLineF, timeout)
-      }
+      val ec      = ExecutionContext.fromExecutorService(pool)
+
       def content(message: String) =
         s"""object Hello {
            |  def main(args: Array[String]): Unit =
@@ -164,14 +159,14 @@ class BloopTests extends ScalaCliSuite {
       inputs.fromRoot { root =>
         val proc = os.proc(TestUtil.cli, "run", "-w", ".")
           .spawn(cwd = root)
-        val firstLine = readLine(proc.stdout)
+        val firstLine = TestUtil.readLine(proc.stdout, ec, timeout)
         expect(firstLine == "Hello")
 
         os.proc(TestUtil.cli, "bloop", "exit")
           .call(cwd = root)
 
         os.write.over(root / sourcePath, content("Foo"))
-        val secondLine = readLine(proc.stdout)
+        val secondLine = TestUtil.readLine(proc.stdout, ec, timeout)
         expect(secondLine == "Foo")
 
         proc.destroy()

modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala

@@ -8,6 +8,7 @@ import java.util.concurrent.{ExecutorService, Executors, ScheduledExecutorServic
 
 import scala.annotation.tailrec
 import scala.concurrent.duration.{Duration, DurationInt, FiniteDuration}
+import scala.concurrent.{Await, ExecutionContext, Future}
 import scala.util.Properties
 
 object TestUtil {
@@ -259,4 +260,16 @@ object TestUtil {
     }
     Map(pathVarName -> s"$binDir${File.pathSeparator}$currentPath")
   }
+
+  def readLine(
+    stream: os.SubProcess.OutputStream,
+    ec: ExecutionContext,
+    timeout: Duration
+  ): String = {
+    implicit val ec0 = ec
+    val readLineF = Future {
+      stream.readLine()
+    }
+    Await.result(readLineF, timeout)
+  }
 }