5 files changed, 48 insertions, 20 deletions
diff --git a/src/test/scala/forge/ForgeTests.scala b/src/test/scala/forge/ForgeTests.scala
new file mode 100644
index 00000000..91e20f45
--- /dev/null
+++ b/src/test/scala/forge/ForgeTests.scala
@@ -0,0 +1,45 @@
+package forge
+
+import utest._
+import Target.noop
+
+object ForgeTests extends TestSuite{
+  object Singleton {
+    val single = noop()
+  }
+  object Pair {
+    val up = noop()
+    val down = noop(up)
+  }
+  object Diamond{
+    val up = noop()
+    val left = noop(up)
+    val right = noop(up)
+    val down = noop(left, right)
+  }
+  object AnonymousDiamond{
+    val up = noop()
+    val down = noop(noop(up), noop(up))
+  }
+  val tests = Tests{
+    'singleton - {
+//      Evaluator.labelTargets(Singleton.single)
+    }
+    'pair - {
+//      Evaluator.labelTargets(Pair.up, Pair.down)
+    }
+    'diamond - {
+//      Evaluator.labelTargets(
+//        Diamond.up, Diamond.left, Diamond.right, Diamond.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"))
+//      val allSources = list(sourceRoot)
+//      val classFiles = compileAll(allSources)
+//      val jar = jarUp(resourceRoot, classFiles)
+//      Evaluator.apply(jar, jnio.Paths.get("target/workspace"))
+//    }
+  }
+}
diff --git a/src/test/scala/hbt/Main.scala b/src/test/scala/forge/Main.scala
index 427f1c41..745a9029 100644
--- a/src/test/scala/hbt/Main.scala
+++ b/src/test/scala/forge/Main.scala
@@ -1,4 +1,4 @@
-package hbt
+package forge
 
 object Main{
   def main(args: Array[String]): Unit = {
diff --git a/src/test/scala/hbt/StaticContextTests.scala b/src/test/scala/forge/StaticContextTests.scala
index c7fcdcd7..0e764fef 100644
--- a/src/test/scala/hbt/StaticContextTests.scala
+++ b/src/test/scala/forge/StaticContextTests.scala
@@ -1,4 +1,4 @@
-package hbt
+package forge
 import DefCtx.StaticContext
 import utest._
 class Helper{
diff --git a/src/test/scala/hbt/TarjanTests.scala b/src/test/scala/forge/TarjanTests.scala
index 48314cf4..5b118368 100644
--- a/src/test/scala/hbt/TarjanTests.scala
+++ b/src/test/scala/forge/TarjanTests.scala
@@ -1,4 +1,4 @@
-package hbt
+package forge
 import utest._
 object TarjanTests extends TestSuite{
   def check(input: Seq[Seq[Int]], expected: Seq[Seq[Int]]) = {
diff --git a/src/test/scala/hbt/HbtTests.scala b/src/test/scala/hbt/HbtTests.scala
deleted file mode 100644
index 0c10be58..00000000
--- a/src/test/scala/hbt/HbtTests.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package hbt
-
-import hbt.Util.{compileAll, jarUp, list}
-import utest._
-import java.nio.{file => jnio}
-object HbtTests extends TestSuite{
-  val tests = Tests{
-    'simple - {
-      val sourceRoot = Target.path(jnio.Paths.get("src/test/resources/example/src"))
-      val resourceRoot = Target.path(jnio.Paths.get("src/test/resources/example/resources"))
-      val allSources = list(sourceRoot)
-      val classFiles = compileAll(allSources)
-      val jar = jarUp(resourceRoot, classFiles)
-      Evaluator.apply(jar, jnio.Paths.get("target/workspace"))
-    }
-  }
-}