first MetacircularTest (evaluating `scalaVersion`) passes. Subsequent tests still fail due to NPE

1 files changed, 11 insertions, 8 deletions

diff --git a/src/test/scala/forge/MetacircularTests.scala b/src/test/scala/forge/MetacircularTests.scala
index f7202287..4f6211da 100644
--- a/src/test/scala/forge/MetacircularTests.scala
+++ b/src/test/scala/forge/MetacircularTests.scala
@@ -9,9 +9,10 @@ object MetacircularTests extends TestSuite{
   object Self extends scalaplugin.Subproject {
     val scalaVersion = T{ "2.12.4" }
     override val compileDeps = T{
-      for(scalaVersion <- scalaVersion) yield Seq(
-        Dep(Mod("org.scala-lang", "scala-reflect"), scalaVersion, configuration = "provided"),
-      )
+//      for(scalaVersion <- scalaVersion) yield Seq(
+//        Dep(Mod("org.scala-lang", "scala-reflect"), scalaVersion, configuration = "provided"),
+//      )
+      Seq(Dep(Mod("org.scala-lang", "scala-reflect"), "2.12.4"))
     }
 
     override val deps = T{
@@ -24,17 +25,19 @@ object MetacircularTests extends TestSuite{
       )
     }
 
-    val basePath = pwd
+    val basePath = T{ pwd }
     override val sources = T{ PathRef(pwd/'src/'main/'scala) }
     override val resources = T{ PathRef(pwd/'src/'main/'resources) }
   }
   val tests = Tests{
     'scalac {
       val workspacePath = pwd / 'target / 'workspace / 'meta
-//      val mapping = Discovered.mapping(Self)
-//      val evaluator = new Evaluator(workspacePath, mapping)
-//      val evaluated = evaluator.evaluate(OSet(Self.deps)).evaluated.filter(mapping.contains)
-
+      val mapping = Discovered.mapping(Self)
+      val evaluator = new Evaluator(workspacePath, mapping)
+      val evaluated1 = evaluator.evaluate(OSet(Self.scalaVersion)).evaluated.collect(mapping)
+      val evaluated2 = evaluator.evaluate(OSet(Self.scalaBinaryVersion)).evaluated.collect(mapping)
+      val evaluated3 = evaluator.evaluate(OSet(Self.compileDeps)).evaluated.collect(mapping)
+      evaluated3
     }
   }
 }