Convert test classes (1)

odersky · odersky · commit 6e54aed6a1fe · 2020-07-10T12:07:15.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala b/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.
diff --git a/compiler/test/dotty/tools/CheckTypesTests.scala b/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) }
 
diff --git a/compiler/test/dotty/tools/DottyTest.scala b/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 {
diff --git a/compiler/test/dotty/tools/DottyTypeStealer.scala b/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
diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala b/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
diff --git a/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala b/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)
 
diff --git a/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/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(
diff --git a/compiler/test/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactoryTest.scala b/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))
diff --git a/compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala b/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 = {
diff --git a/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala b/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala
@@ -5,6 +5,8 @@ import dotty.tools.dotc.ast.{Trees,tpd}
 import dotty.tools.dotc.core.Names._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.Contexts.{Context, ctx}
+
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -26,7 +28,7 @@ class PrinterTests extends DottyTest {
     """
 
     checkCompile("typer", source) { (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val bar = tree.find(tree => tree.symbol.name == termName("bar")).get
       assertEquals("package object foo", bar.symbol.owner.show)
     }
@@ -43,7 +45,7 @@ class PrinterTests extends DottyTest {
     """.stripMargin
 
     checkCompile("typer", source) { (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val bar @ Trees.DefDef(_, _, _, _, _) = tree.find(tree => tree.symbol.name == termName("bar2")).get
       assertEquals("Int & (Boolean | String)", bar.tpt.show)
     }
diff --git a/compiler/test/dotty/tools/dotc/reporting/UserDefinedErrorMessages.scala b/compiler/test/dotty/tools/dotc/reporting/UserDefinedErrorMessages.scala
@@ -24,7 +24,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
         |}
       """.stripMargin
     }.expect { (itcx, messages) =>
-      implicit val ctx: Context = itcx
+      given Context = itcx
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -48,7 +48,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
         |}
       """.stripMargin
     }.expect { (itcx, messages) =>
-      implicit val ctx: Context = itcx
+      given Context = itcx
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -73,7 +73,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
         |}
       """.stripMargin
     }.expect { (itcx, messages) =>
-      implicit val ctx: Context = itcx
+      given Context = itcx
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -95,7 +95,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
         |}
       """.stripMargin
     }.expect { (itcx, messages) =>
-      implicit val ctx: Context = itcx
+      given Context = itcx
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -117,7 +117,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
         |}
       """.stripMargin
     }.expect { (itcx, messages) =>
-      implicit val ctx: Context = itcx
+      given Context = itcx
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
diff --git a/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala b/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala
@@ -25,7 +25,7 @@ class CreateCompanionObjectsTest extends DottyTest {
   @Test
   def shouldCreateNonExistingObjectsInPackage = checkCompile("typer", "class A{} ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
 
       val transformer = new PostTyperTransformer {
         override def transformations = Array(new CreateCompanionObjects {
@@ -51,7 +51,7 @@ class CreateCompanionObjectsTest extends DottyTest {
   @Test
   def shouldCreateNonExistingObjectsInBlock = checkCompile("typer", "class D {def p = {class A{}; 1}} ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val transformer = new PostTyperTransformer {
         override def transformations = Array(new CreateCompanionObjects {
 
@@ -76,7 +76,7 @@ class CreateCompanionObjectsTest extends DottyTest {
   @Test
   def shouldCreateNonExistingObjectsInTemplate = checkCompile("typer", "class D {class A{}; } ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val transformer = new PostTyperTransformer {
         override def transformations = Array(new CreateCompanionObjects {
           override def name: String = "create all companion modules"
@@ -100,7 +100,7 @@ class CreateCompanionObjectsTest extends DottyTest {
   @Test
   def shouldCreateOnlyIfAskedFor = checkCompile("typer", "class DONT {class CREATE{}; } ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       val transformer = new PostTyperTransformer {
         override def transformations = Array(new CreateCompanionObjects {
           override def name: String = "create all companion modules"
diff --git a/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala
@@ -20,7 +20,7 @@ class PostTyperTransformerTest extends DottyTest {
   @Test
   def shouldStripImports = checkCompile("typer", "class A{ import scala.collection.mutable._; val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends TreeTransform {
         override def name: String = "empty"
         init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -40,7 +40,7 @@ class PostTyperTransformerTest extends DottyTest {
   @Test
   def shouldStripNamedArgs = checkCompile("typer", "class A{ def p(x:Int, y:Int= 2) = 1; p(1, y = 2)}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends TreeTransform {
         override def name: String = "empty"
         init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -60,7 +60,7 @@ class PostTyperTransformerTest extends DottyTest {
   @Test
   def shouldReorderExistingObjectsInPackage = checkCompile("typer", "object A{}; class A{} ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends TreeTransform {
         override def name: String = "empty"
         init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -84,7 +84,7 @@ class PostTyperTransformerTest extends DottyTest {
   @Test
   def shouldReorderExistingObjectsInBlock = checkCompile("typer", "class D {def p = {object A{}; class A{}; 1}} ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends TreeTransform {
         override def name: String = "empty"
         init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -108,7 +108,7 @@ class PostTyperTransformerTest extends DottyTest {
   @Test
   def shouldReorderExistingObjectsInTemplate = checkCompile("typer", "class D {object A{}; class A{}; } ") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends TreeTransform {
         override def name: String = "empty"
         init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
diff --git a/compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala
@@ -13,7 +13,7 @@ class TreeTransformerTest extends DottyTest {
   @Test
   def shouldReturnSameTreeIfUnchanged: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class EmptyTransform extends MiniPhase {
         override def phaseName: String = "empty"
         init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -29,7 +29,7 @@ class TreeTransformerTest extends DottyTest {
   // Disabled, awaiting resolution. @Test
   def canReplaceConstant: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class ConstantTransform extends MiniPhase {
 
         override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = tpd.Literal(Constant(2))
@@ -47,7 +47,7 @@ class TreeTransformerTest extends DottyTest {
   @Test
   def canOverwrite: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class Transformation extends MiniPhase {
 
         override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = tpd.Literal(Constant(-1))
@@ -73,7 +73,7 @@ class TreeTransformerTest extends DottyTest {
   @Test
   def transformationOrder: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       class Transformation1 extends MiniPhase {
         override def phaseName: String = "transformationOrder1"
 
@@ -115,7 +115,7 @@ class TreeTransformerTest extends DottyTest {
   @Test
   def invocationCount: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
-      implicit val ctx = context
+      given Context = context
       var transformed1 = 0
       class Transformation1 extends MiniPhase {
         override def phaseName: String = "invocationCount1"
diff --git a/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala b/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala
@@ -33,7 +33,7 @@ class DivergenceCheckerTests extends DottyTest {
 
     checkTypes(source, List(types, elements)) {
       case (List(tpes, elements0), context) =>
-        implicit val ctx = context
+        given Context = context
 
         val List(a, b, n, o, s, t2, i, l) = elements0.map(_.typeConstructor)
         val expectedCoveringSets = List(
diff --git a/compiler/test/dotty/tools/dotc/typer/SubtypingInvariantTests.scala b/compiler/test/dotty/tools/dotc/typer/SubtypingInvariantTests.scala
@@ -11,7 +11,7 @@ class SubtypingInvariantTests extends DottyTest {
   @Test
   def typeVarInvariant(): Unit = {
     checkCompile("typer", "class A") { (_, ctx0) =>
-      implicit val ctx: Context = ctx0
+      given Context = ctx0
       val a = newTypeVar(TypeBounds.empty)
       val b = newTypeVar(TypeBounds.empty)
       assert(a <:< b)
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -4,6 +4,7 @@ import java.util.regex.Pattern
 
 import org.junit.Assert.{assertTrue => assert, _}
 import org.junit.{Ignore, Test}
+import dotty.tools.dotc.core.Contexts.Context
 
 class ReplCompilerTests extends ReplTest {
   import ReplCompilerTests._
@@ -189,7 +190,7 @@ class ReplCompilerTests extends ReplTest {
     }
 
   @Test def i7934: Unit = fromInitialState { state =>
-    implicit val ctx = state.context
+    given Context = state.context
     assertFalse(ParseResult.isIncomplete("_ + 1"))  // was: assertThrows[NullPointerException]
   }
 
