Adjust to upstream Util changes

sbt · Oct 4, 2020 · 582d2c8 · 582d2c8
1 parent 5d32d67
commit 582d2c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala
@@ -805,8 +805,13 @@ case class ProjectStructure(
       val problems = getProblems().filter(_.severity == severity)
       problems.lift(index) match {
         case Some(problem) =>
-          val msg = s"'${problem.message}' doesn't contain '$expected'."
-          assert(problem.message.contains(expected), msg)
+          val problemMessage: String = problem.message
+          // See ScriptedTests.scala.
+          // val handlersAndStatements = parser.parse(file.toFile, true) doesn't correctly parse
+          val dropQuotes =
+            if (expected.startsWith("\"")) expected.drop(1).dropRight(1)
+            else expected
+          assert(problemMessage.contains(dropQuotes), s"'$problemMessage' doesn't contain '$dropQuotes'.")
         case None =>
           throw new TestFailed(
             s"Problem not found: $index (there are ${problems.length} problem with severity $severity)."

diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/ScriptedTests.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/ScriptedTests.scala
@@ -21,7 +21,7 @@ import sbt.io.FileFilter._
 import sbt.internal.io.Resources
 import sbt.internal.util.BufferedAppender
 import sbt.internal.util.{ ConsoleAppender, ConsoleOut, ManagedLogger, TraceEvent }
-import sbt.util.{ Level, LogExchange }
+import sbt.util.{ Level, LoggerContext }
 
 final class ScriptedTests(
     resourceBaseDirectory: Path,
@@ -98,15 +98,15 @@ final class ScriptedTests(
     val writer = new BufferedWriter(new FileWriter(logFile.toFile), BufferSize)
     val fileOut = ConsoleOut.bufferedWriterOut(writer)
     val fileAppender = ConsoleAppender(name, fileOut, useFormat = false)
-    LogExchange.bindLoggerAppenders(name, List(fileAppender -> Level.Debug))
+    LoggerContext.globalContext.addAppender(name, fileAppender -> Level.Debug)
     logger
   }
 
   private def createBatchLogger(name: String): ScriptedLogger = {
-    val logger = LogExchange.logger(name)
+    val logger = LoggerContext.globalContext.logger(name, None, None)
     val outAppender = BufferedAppender(ConsoleAppender())
-    LogExchange.unbindLoggerAppenders(name)
-    LogExchange.bindLoggerAppenders(name, List(outAppender -> outLevel))
+    LoggerContext.globalContext.clearAppenders(name)
+    LoggerContext.globalContext.addAppender(name, outAppender -> outLevel)
     ScriptedLogger(logger, outAppender)
   }
 
@@ -215,7 +215,7 @@ final class ScriptedTests(
       .andFinally(buffer.stopBuffer())
       .apply {
         val parser = new TestScriptParser(handlers)
-        val handlersAndStatements = parser.parse(file.toFile)
+        val handlersAndStatements = parser.parse(file.toFile, false)
         runner.run(handlersAndStatements, states)
 
         // Handle successful tests