Add test for tree injector

Author: felixmulder

project/Build.scala

@@ -367,6 +367,9 @@ object Build {
       connectInput in run := true,
       outputStrategy := Some(StdoutOutput),
 
+      // enable verbose exception messages for JUnit
+      testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
+
       run := Def.inputTaskDyn {
         val classPath =
           (packageAll in `dotty-compiler-bootstrapped`).value("dotty-library") + ":" +

repl/src/dotty/tools/repl/InjectableTree.scala

@@ -14,10 +14,13 @@ import results.Result
 case class InjectableTree(obj: Thicket, nextId: Int)
 
 object InjectableTree {
+  /** Create the initial InjectableTree - after being called once, should never
+   *  be called again
+   */
   def apply()(implicit ctx: Context) = new InjectableTree({
     val defn = ctx.definitions
     val sym = ctx.newCompleteModuleSymbol(
-      ctx.owner, "ReplSession".toTermName,
+      defn.RootPackage, "ReplSession".toTermName,
       EmptyFlags, EmptyFlags, defn.AnyType :: Nil, Scopes.newScope
     )
     ModuleDef(sym, Nil)
@@ -26,11 +29,9 @@ object InjectableTree {
   def patch(tree: InjectableTree, res: TypedTrees)
            (implicit ctx: Context): Result[InjectableTree] = {
 
-    val changedTrees = res.trees.map(t => t.changeOwner(t.symbol, tree.obj.symbol))
-    val treeNames = changedTrees.map(_.symbol.show)
+    val changedTrees =
+      res.trees.map(t => t.changeOwner(t.symbol, tree.obj.symbol)).toList
 
-    println(tree.obj)
-
-    new InjectableTree(cpy.Thicket(tree.obj)(Nil), tree.nextId)
+    new InjectableTree(cpy.Thicket(tree.obj)(changedTrees), tree.nextId)
   }
 }

repl/test/dotty/tools/repl/InjectableTreeTests.scala

@@ -3,14 +3,7 @@ package repl
 
 import org.junit.Assert._
 import org.junit.Test
-
-class ReplTest extends Repl(Array(
-  // TODO: get rid of this!
-  "-classpath",
-    List("../out/bootstrap/dotty-library-bootstrapped/scala-0.2/classes",
-         "../interfaces/target/classes").mkString(":")
-))
-
+import dotc.ast.tpd
 
 class InjectableTreeTests extends ReplTest {
   @Test def crashCheck = {
@@ -20,4 +13,17 @@ class InjectableTreeTests extends ReplTest {
     val symName = injTree.obj.trees(1).symbol.show
     assert(symName == "object ReplSession", symName)
   }
+
+  @Test def injectOnce = {
+    implicit val ctx = myCtx
+
+    val injTree = InjectableTree()
+    val parsed @ Parsed(_,_) = ParseResult("def foo: 1 = 1")
+    val typer = new ReplTyper(myCtx)
+
+    val tt @ TypedTrees(_,_) = typer.typeCheck(parsed, 0)
+    val newInjTree @ InjectableTree(_,_) = InjectableTree.patch(injTree, tt)
+
+    // assert( newInjTree has 1 method == "def foo: 1 = 1" )
+  }
 }

repl/test/dotty/tools/repl/ReplTest.scala

@@ -0,0 +1,10 @@
+package dotty.tools
+package repl
+
+class ReplTest extends Repl(Array(
+  // TODO: get rid of this!
+  "-classpath",
+    List("../out/bootstrap/dotty-library-bootstrapped/scala-0.2/classes",
+         "../interfaces/target/classes").mkString(":")
+))
+

repl/test/dotty/tools/repl/TyperTests.scala

@@ -0,0 +1,15 @@
+package dotty.tools
+package repl
+
+import org.junit.Assert._
+import org.junit.Test
+
+class ReplTyperTests extends ReplTest {
+  @Test def typeCheck = {
+    val parsed @ Parsed(_,_) = ParseResult("def foo: 1 = 1")(myCtx)
+    val typer = new ReplTyper(myCtx)
+    val res = typer.typeCheck(parsed, 0)(myCtx)
+    assert(res.isInstanceOf[TypedTrees],
+      s"Assumed value of `typeCheck` would be TypedTrees - but got: $res")
+  }
+}