From 550772d7515757339269c28c41fd0d8109e0fa2c Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 9 Nov 2017 22:36:47 -0800 Subject: Migrate over to the new `Task`/`Target`/`Command` split --- core/src/test/scala/forge/TestUtil.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/src/test/scala/forge/TestUtil.scala') diff --git a/core/src/test/scala/forge/TestUtil.scala b/core/src/test/scala/forge/TestUtil.scala index 005bcfef..91dc3da9 100644 --- a/core/src/test/scala/forge/TestUtil.scala +++ b/core/src/test/scala/forge/TestUtil.scala @@ -1,13 +1,13 @@ package forge -import forge.define.Target +import forge.define.Task import forge.util.{Args, OSet} import utest.assert import scala.collection.mutable object TestUtil { - def test(inputs: Target[Int]*) = { + def test(inputs: Task[Int]*) = { new Test(inputs, pure = inputs.nonEmpty) } @@ -16,8 +16,8 @@ object TestUtil { * controlled externally, so you can construct arbitrary dataflow graphs and * test how changes propagate. */ - class Test(val inputs: Seq[Target[Int]], - val pure: Boolean) extends Target[Int]{ + class Test(val inputs: Seq[Task[Int]], + val pure: Boolean) extends Task[Int]{ var counter = 0 def evaluate(args: Args) = { counter + args.args.map(_.asInstanceOf[Int]).sum @@ -25,8 +25,8 @@ object TestUtil { override def sideHash = counter } - def checkTopological(targets: OSet[Target[_]]) = { - val seen = mutable.Set.empty[Target[_]] + def checkTopological(targets: OSet[Task[_]]) = { + val seen = mutable.Set.empty[Task[_]] for(t <- targets.items.reverseIterator){ seen.add(t) for(upstream <- t.inputs){ -- cgit v1.2.3