From 453ccc6805e67977153733e4452a046ae7b1168f Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Mon, 25 Mar 2024 15:47:40 +0100
Subject: [PATCH] Uncomment pending tests

---
 .../scala/{ParseKey.scala => ParseKeySpec.scala}   |  4 +---
 main/src/test/scala/ParserSpec.scala               |  2 --
 main/src/test/scala/PluginCommandTest.scala        | 14 ++++++--------
 main/src/test/scala/testpkg/CompletionSpec.scala   |  2 --
 4 files changed, 7 insertions(+), 15 deletions(-)
 rename main/src/test/scala/{ParseKey.scala => ParseKeySpec.scala} (99%)

diff --git a/main/src/test/scala/ParseKey.scala b/main/src/test/scala/ParseKeySpec.scala
similarity index 99%
rename from main/src/test/scala/ParseKey.scala
rename to main/src/test/scala/ParseKeySpec.scala
index 821d1891d..57363a767 100644
--- a/main/src/test/scala/ParseKey.scala
+++ b/main/src/test/scala/ParseKeySpec.scala
@@ -4,7 +4,6 @@
  * Copyright 2008 - 2010, Mark Harrah
  * Licensed under Apache License 2.0 (see LICENSE)
  */
-/*
 package sbt
 
 import sbt.Def.{ ScopedKey, displayFull, displayMasked }
@@ -20,7 +19,7 @@ import hedgehog.runner._
  * Tests that the scoped key parser in Act can correctly parse a ScopedKey converted by Def.show*Key.
  * This includes properly resolving omitted components.
  */
-object ParseKey extends Properties {
+object ParseKeySpec extends Properties {
   val exampleCount = 1000
 
   override def tests: List[Test] = List(
@@ -195,4 +194,3 @@ object ParseKey extends Properties {
     allProjects(label)
   }
 }
- */
diff --git a/main/src/test/scala/ParserSpec.scala b/main/src/test/scala/ParserSpec.scala
index 1487c8e6d..d0309fe85 100644
--- a/main/src/test/scala/ParserSpec.scala
+++ b/main/src/test/scala/ParserSpec.scala
@@ -4,7 +4,6 @@
  * Copyright 2008 - 2010, Mark Harrah
  * Licensed under Apache License 2.0 (see LICENSE)
  */
-/*
 package sbt
 
 import java.net.URI
@@ -81,4 +80,3 @@ object ParserSpec extends Properties {
       .log(s"$string parsed back to $resultStr rather than $scopedKey")
   }
 }
- */
diff --git a/main/src/test/scala/PluginCommandTest.scala b/main/src/test/scala/PluginCommandTest.scala
index d9ba8e867..f2cb823b6 100644
--- a/main/src/test/scala/PluginCommandTest.scala
+++ b/main/src/test/scala/PluginCommandTest.scala
@@ -4,7 +4,6 @@
  * Copyright 2008 - 2010, Mark Harrah
  * Licensed under Apache License 2.0 (see LICENSE)
  */
-/*
 package sbt
 
 import java.io._
@@ -18,15 +17,14 @@ import sbt.internal.util.{
   GlobalLogging,
   MainAppender,
   Settings,
-  Terminal => ITerminal,
+  Terminal,
 }
+import sbt.internal.inc.PlainVirtualFileConverter
 
 object PluginCommandTestPlugin0 extends AutoPlugin { override def requires = empty }
 
 package subpackage {
-
   object PluginCommandTestPlugin1 extends AutoPlugin { override def requires = empty }
-
 }
 
 object PluginCommandTest extends verify.BasicTestSuite {
@@ -73,7 +71,7 @@ object FakeState {
     val logFile = File.createTempFile("sbt", ".log")
     try {
       val state = FakeState(logFile, enabledPlugins: _*)
-      ITerminal.withOut(new PrintStream(outBuffer, true)) {
+      Terminal.withOut(new PrintStream(outBuffer, true)) {
         MainLoop.processCommand(Exec(input, None), state)
       }
       new String(outBuffer.toByteArray)
@@ -115,7 +113,8 @@ object FakeState {
       Nil
     )
 
-    val pluginData = PluginData(Nil, Nil, None, None, Nil, Nil, Nil, Nil, Nil, None)
+    val converter = PlainVirtualFileConverter.converter
+    val pluginData = PluginData(Nil, converter)
     val builds: DetectedModules[BuildDef] = new DetectedModules[BuildDef](Nil)
 
     val detectedAutoPlugins: Seq[DetectedAutoPlugin] =
@@ -123,7 +122,7 @@ object FakeState {
     val detectedPlugins = new DetectedPlugins(detectedAutoPlugins, builds)
     val loadedPlugins =
       new LoadedPlugins(base, pluginData, ClassLoader.getSystemClassLoader, detectedPlugins)
-    val buildUnit = new BuildUnit(base.toURI, base, loadedDefinitions, loadedPlugins)
+    val buildUnit = new BuildUnit(base.toURI, base, loadedDefinitions, loadedPlugins, converter)
 
     val (partBuildUnit: PartBuildUnit, _) = Load.loaded(buildUnit)
     val loadedBuildUnit = Load.resolveProjects(base.toURI, partBuildUnit, _ => testProject.id)
@@ -167,4 +166,3 @@ object FakeState {
   }
 
 }
- */
diff --git a/main/src/test/scala/testpkg/CompletionSpec.scala b/main/src/test/scala/testpkg/CompletionSpec.scala
index df1ab1140..ee364eb6f 100644
--- a/main/src/test/scala/testpkg/CompletionSpec.scala
+++ b/main/src/test/scala/testpkg/CompletionSpec.scala
@@ -4,7 +4,6 @@
  * Copyright 2008 - 2010, Mark Harrah
  * Licensed under Apache License 2.0 (see LICENSE)
  */
-/*
 package testpkg
 
 import java.net.URI
@@ -87,4 +86,3 @@ object CompletionSpec extends Properties {
       .log(s"structure: $structure")
   }
 }
- */