Convert test classes (1)

Author: odersky

compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala

@@ -12,6 +12,7 @@ import scala.annotation.tailrec
 import dotty.tools.io.{AbstractFile, ClassPath, ClassRepresentation, FileZipArchive, ManifestResources}
 import dotty.tools.dotc.core.Contexts.{Context, ctx}
 import FileUtils._
+import dotty.tools.dotc.core.Contexts.{Context, ctx}
 
 /**
  * A trait providing an optional cache for classpath entries obtained from zip and jar files.

compiler/test/dotty/tools/CheckTypesTests.scala

@@ -5,6 +5,7 @@ import org.junit.Assert.{ assertFalse, assertTrue, fail }
 
 import dotc.ast.Trees._
 import dotc.core.Decorators._
+import dotc.core.Contexts.{Context, ctx}
 
 class CheckTypeTest extends DottyTest {
   @Test
@@ -27,7 +28,7 @@ class CheckTypeTest extends DottyTest {
 
     checkTypes(source, types: _*) {
       case (List(a, b, lu, li, lr, ls, la, lb), context) =>
-        implicit val ctx = context
+        given Context = context
 
         assertTrue  ( b <:<  a)
         assertTrue  (li <:< lu)
@@ -59,7 +60,7 @@ class CheckTypeTest extends DottyTest {
 
     checkTypes(source, List(typesA, typesB)) {
       case (List(sups, subs), context) =>
-        implicit val ctx = context
+        given Context = context
 
         sups.lazyZip(subs).foreach { (sup, sub) => assertTrue(sub <:< sup) }
 

compiler/test/dotty/tools/DottyTest.scala

@@ -80,7 +80,7 @@ trait DottyTest extends ContextEscapeDetection {
     val gatheredSource = s"${source}\nobject A$dummyName {$vals}"
     checkCompile("typer", gatheredSource) {
       (tree, context) =>
-        implicit val ctx = context
+        given Context = context
         val findValDef: (List[tpd.ValDef], tpd.Tree) => List[tpd.ValDef] =
           (acc , tree) =>  {
             tree match {

compiler/test/dotty/tools/DottyTypeStealer.scala

@@ -16,7 +16,7 @@ object DottyTypeStealer extends DottyTest {
     var tp: List[Type] = null
     checkCompile("typer", gatheredSource) {
       (tree, context) =>
-        implicit val ctx = context
+        given Context = context
         val findValDef: (List[ValDef], tpd.Tree) => List[ValDef] =
           (acc , tree) =>  tree match {
             case t: ValDef if t.name.startsWith(dummyName) => t :: acc

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala

@@ -4,7 +4,7 @@ package backend.jvm
 
 import vulpix.TestConfiguration
 
-import dotc.core.Contexts.{Context, ContextBase}
+import dotc.core.Contexts.{Context, ContextBase, ctx}
 import dotc.core.Comments.{ContextDoc, ContextDocstrings}
 import dotc.core.Phases.Phase
 import dotc.Compiler
@@ -58,7 +58,7 @@ trait DottyBytecodeTest {
 
   /** Checks source code from raw strings */
   def checkBCode(scalaSources: List[String], javaSources: List[String] = Nil)(checkOutput: AbstractFile => Unit): Unit = {
-    implicit val ctx: Context = initCtx
+    given Context = initCtx
 
     val compiler = new Compiler
     val run = compiler.newRun

compiler/test/dotty/tools/compilerSupport.scala

@@ -20,10 +20,10 @@ import dotc.core.Comments.{ContextDoc, ContextDocstrings}
 def inCompilerContext[T](classpath: String, separateRun: Boolean = true, scalaSources: String*)(op: Context ?=> T): T =
   val compiler = Compiler()
   val rootCtx = initCtx(classpath)
-  val firstRun = compiler.newRun(rootCtx)
+  val firstRun = compiler.newRun(using rootCtx)
   firstRun.compileFromStrings(scalaSources.toList)
   val opRun = if separateRun
-    then compiler.newRun(rootCtx)
+    then compiler.newRun(using rootCtx)
     else firstRun
   op(using opRun.runContext)
 

compiler/test/dotty/tools/dotc/ast/DesugarTests.scala

@@ -23,7 +23,7 @@ class DesugarTests extends DottyTest {
 
   @Test def caseClassHasCorrectMembers: Unit =
     checkCompile("typer", "case class Foo(x: Int, y: String)") { (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val ccTree = tree.find(tree => tree.symbol.name == typeName("Foo")).get
       val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)
 
@@ -38,7 +38,7 @@ class DesugarTests extends DottyTest {
 
   @Test def caseClassCompanionHasCorrectMembers: Unit =
     checkCompile("typer", "case class Foo(x: Int, y: String)") { (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val ccTree = tree.find(tree => tree.symbol.name == termName("Foo")).get
       val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)
 

compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala

@@ -8,6 +8,7 @@ import core.StdNames.nme
 import core.Types._
 import core.Symbols._
 import org.junit.Assert._
+import core.Contexts.{Context, ctx}
 
 class TreeInfoTest extends DottyTest {
 
@@ -16,7 +17,7 @@ class TreeInfoTest extends DottyTest {
   @Test
   def testDefPath: Unit = checkCompile("typer", "class A { def bar = { val x = { val z = 0; 0} }} ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val xTree = tree.find(tree => tree.symbol.name == termName("x")).get
       val path = defPath(xTree.symbol, tree)
       assertEquals(List(

compiler/test/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactoryTest.scala

@@ -4,7 +4,7 @@ import org.junit.Test
 import java.nio.file._
 import java.nio.file.attribute.FileTime
 
-import dotty.tools.dotc.core.Contexts.{Context, ContextBase}
+import dotty.tools.dotc.core.Contexts.{Context, ContextBase, ctx}
 import dotty.tools.io.AbstractFile
 
 
@@ -16,7 +16,7 @@ class ZipAndJarFileLookupFactoryTest {
     val f = Files.createTempFile("test-", ".jar")
     Files.delete(f)
 
-    implicit val ctx: Context = new ContextBase().initialCtx
+    given Context = new ContextBase().initialCtx
     assert(!ctx.settings.YdisableFlatCpCaching.value) // we're testing with our JAR metadata caching enabled.
 
     def createCp = ZipAndJarClassPathFactory.create(AbstractFile.getFile(f))

compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala

@@ -14,7 +14,7 @@ import core.Contexts._
 import core.Flags
 
 object ModifiersParsingTest {
-  implicit val ctx: Context = (new ContextBase).initialCtx
+  given Context = (new ContextBase).initialCtx
 
   def parse(code: String): Tree = {
     val (_, stats) = new Parser(SourceFile.virtual("<meta>", code)).templateStatSeq()
@@ -74,7 +74,7 @@ object ModifiersParsingTest {
 
 
 class ModifiersParsingTest {
-  import ModifiersParsingTest._
+  import ModifiersParsingTest.{_, given _}
 
 
   @Test def valDef = {