update to utest 0.6.0, enable stacktrace highlighting

3 files changed, 19 insertions, 11 deletions

diff --git a/build.sbt b/build.sbt
index 2837d46e..340f4e6c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,9 +4,9 @@ name := "forge"
 
 organization := "com.lihaoyi"
 
-libraryDependencies += "com.lihaoyi" %% "utest" % "0.5.4" % "test"
+libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.0" % "test"
 
-testFrameworks += new TestFramework("utest.runner.Framework")
+testFrameworks += new TestFramework("forge.Framework")
 
 libraryDependencies ++= Seq(
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
diff --git a/src/test/scala/forge/ForgeTests.scala b/src/test/scala/forge/ForgeTests.scala
index c3414be9..92ccd112 100644
--- a/src/test/scala/forge/ForgeTests.scala
+++ b/src/test/scala/forge/ForgeTests.scala
@@ -26,17 +26,18 @@ object ForgeTests extends TestSuite{
     val down = noop(noop(up), noop(up))
   }
   val tests = Tests{
-    'singleton - {
-//      Evaluator.labelTargets(Singleton.single)
-    }
+//    'singleton - {
+//      evaluator.apply(Singleton.single)
+//    }
     'pair - {
-//      Evaluator.labelTargets(Pair.up, Pair.down)
-    }
-    'diamond - {
-//      Evaluator.labelTargets(
-//        Diamond.up, Diamond.left, Diamond.right, Diamond.down
-//      )
+      evaluator.prepareTransitiveTargets(Seq(Pair.down))
     }
+//    'diamond - {
+//      evaluator.apply(Diamond.down)
+//    }
+//    'anonDiamond - {
+//      evaluator.apply(AnonymousDiamond.down)
+//    }
 //    'full - {
 //      val sourceRoot = Target.path(jnio.Paths.get("src/test/resources/example/src"))
 //      val resourceRoot = Target.path(jnio.Paths.get("src/test/resources/example/resources"))
diff --git a/src/test/scala/forge/Framework.scala b/src/test/scala/forge/Framework.scala
new file mode 100644
index 00000000..ccfdf69b
--- /dev/null
+++ b/src/test/scala/forge/Framework.scala
@@ -0,0 +1,7 @@
+package forge
+
+class Framework extends utest.runner.Framework {
+  override def exceptionStackFrameHighlighter(s: StackTraceElement) = {
+    s.getClassName.startsWith("forge.")
+  }
+}