From d852209172c0183c1f1d7bf10494f844a6209c6c Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 4 Mar 2019 12:17:40 +0100
Subject: [PATCH] Tweak tests

Most of those adjustments are required when using the coursier-based sbt
launcher.
---
 modules/sbt-coursier/src/sbt-test/shared-1/clean/test     | 1 +
 .../sbt-coursier/src/sbt-test/shared-1/logger/build.sbt   | 8 +++++++-
 .../shared-2/scala-jars/src/main/scala/Main.scala         | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/clean/test b/modules/sbt-coursier/src/sbt-test/shared-1/clean/test
index 6dc6f6976..f2a470ad5 100644
--- a/modules/sbt-coursier/src/sbt-test/shared-1/clean/test
+++ b/modules/sbt-coursier/src/sbt-test/shared-1/clean/test
@@ -1,3 +1,4 @@
+> clean
 > checkEmpty
 > update
 > checkNotEmpty
diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt
index d45af224f..a9c823b68 100644
--- a/modules/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt
+++ b/modules/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt
@@ -7,7 +7,7 @@ coursierCache := baseDirectory.value / "cache"
 logFile := baseDirectory.value / "log"
 
 coursierLogger := {
-  val logStream = new java.io.PrintStream(logFile.value)
+  var logStream: java.io.PrintStream = null
   def log(msg: String): Unit = {
     println(msg)
     logStream.println(msg)
@@ -16,6 +16,9 @@ coursierLogger := {
 
   val logger = new coursier.cache.CacheLogger {
     override def init(sizeHint: Option[Int]): Unit = {
+      logStream = new java.io.PrintStream(
+        new java.io.FileOutputStream(logFile.value, true)
+      )
       log("init")
     }
     override def foundLocally(url: String): Unit = {
@@ -29,6 +32,9 @@ coursierLogger := {
     }
     override def stop(): Unit = {
       log("stop")
+      logStream.flush()
+      logStream.close()
+      logStream = null
     }
   }
 
diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala
index 43f0726f1..932b548a8 100644
--- a/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala
+++ b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala
@@ -26,7 +26,10 @@ object Main extends App {
     "sbt.global.base",
     sys.props("user.home") + "/.sbt"
   ))
-  val prefix = new File(sbtBase, "boot").getAbsolutePath
+  val prefixes = Seq(new File(sbtBase, "boot").getAbsolutePath) ++
+    Seq("coursier.sbt-launcher.dirs.scala-jars", "coursier.sbt-launcher.dirs.base")
+      .flatMap(sys.props.get(_))
+      .map(new File(_).getAbsolutePath)
 
   def fromBootAndUnique(name: String): Unit = {
     val jars = cp.filter(_.getName.startsWith(name)).distinct
@@ -34,7 +37,7 @@ object Main extends App {
 
     val Seq(jar) = jars
 
-    assert(jar.getAbsolutePath.startsWith(prefix), s"JAR for $name ($jar) not under $prefix")
+    assert(prefixes.exists(jar.getAbsolutePath.startsWith), s"JAR for $name ($jar) not under any of ${prefixes.mkString(", ")}")
   }
 
   val props = Thread.currentThread()