repairs the tests after the refactoring spree

2 files changed, 9 insertions, 6 deletions

diff --git a/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala b/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala
index dc7d42d23e..dd8fcd4d9e 100644
--- a/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala
+++ b/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala
@@ -2,8 +2,8 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo(c: Ctx)(x: c.Expr[Int]) = {
-    import c.mirror._
+    import c.universe._
     val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))
-    Expr[Int](body)
+    c.Expr[Int](body)
   }
-}
+}
\ No newline at end of file
diff --git a/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
index cf34f1685d..32a8958577 100644
--- a/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
+++ b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
@@ -3,15 +3,18 @@
 //}
 
 object Test extends App {
-  import scala.reflect.mirror._
+  import scala.reflect.runtime.universe._
+  import scala.reflect.runtime.universe.Flag._
+  import scala.reflect.runtime.{currentMirror => cm}
+  import scala.tools.reflect.ToolBox
 
   val macrobody = Select(Ident(newTermName("Impls")), newTermName("foo"))
   val macroparam = ValDef(NoMods, newTermName("x"), TypeTree(definitions.IntClass.asType), EmptyTree)
-  val macrodef = DefDef(Modifiers(Set(scala.reflect.api.Modifier.`macro`)), newTermName("foo"), Nil, List(List(macroparam)), TypeTree(), macrobody)
+  val macrodef = DefDef(Modifiers(MACRO), newTermName("foo"), Nil, List(List(macroparam)), TypeTree(), macrobody)
   val modulector = DefDef(NoMods, nme.CONSTRUCTOR, Nil, List(List()), TypeTree(), Block(Apply(Select(Super(This(EmptyTypeName), EmptyTypeName), nme.CONSTRUCTOR), List())))
   val module = ModuleDef(NoMods, newTermName("Macros"), Template(Nil, emptyValDef, List(modulector, macrodef)))
   val macroapp = Apply(Select(Ident("Macros"), newTermName("foo")), List(Literal(Constant(42))))
   val tree = Block(macrodef, module, macroapp)
-  val toolbox = mkToolBox(options = "-language:experimental.macros")
+  val toolbox = cm.mkToolBox(options = "-language:experimental.macros")
   println(toolbox.runExpr(tree))
 }