diff options
Diffstat (limited to 'src/test/scala/forge/GraphTests.scala')
| -rw-r--r-- | src/test/scala/forge/GraphTests.scala | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/test/scala/forge/GraphTests.scala b/src/test/scala/forge/GraphTests.scala index 86955fda..5cfea75d 100644 --- a/src/test/scala/forge/GraphTests.scala +++ b/src/test/scala/forge/GraphTests.scala @@ -81,16 +81,15 @@ object GraphTests extends TestSuite{ target: Target.Test, expected: OSet[(OSet[Target.Test], Int)]) = { - val mapping: Map[Target[_], Seq[String]] = { - implicitly[Discovered[T]].apply(base).map(_.swap).toMap - } - val grouped = Evaluator.groupAroundNamedTargets( - Evaluator.topoSortedTransitiveTargets(OSet(target)), - mapping - ) - TestUtil.checkTopological(grouped.flatMap(_.items)) + val mapping = Discovered.mapping(base) + val topoSortedTransitive = Evaluator.topoSortedTransitiveTargets(OSet(target)) + + val grouped = Evaluator.groupAroundNamedTargets(topoSortedTransitive, mapping) + val flattened = OSet.from(grouped.values().flatMap(_.items)) + + TestUtil.checkTopological(flattened) for(((expectedPresent, expectedSize), i) <- expected.items.zipWithIndex){ - val grouping = grouped.items(i) + val grouping = grouped.lookupKey(i) assert( grouping.size == expectedSize, grouping.filter(mapping.contains) == expectedPresent |