From 3f2f12f5bb35a71c622a68941e2aef5773704e57 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 25 Mar 2014 01:49:08 -0400 Subject: [PATCH] Fix PluginsTest --- main/src/test/scala/PluginsTest.scala | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/main/src/test/scala/PluginsTest.scala b/main/src/test/scala/PluginsTest.scala index a558854f1..eed8a1143 100644 --- a/main/src/test/scala/PluginsTest.scala +++ b/main/src/test/scala/PluginsTest.scala @@ -53,44 +53,38 @@ object AI lazy val deducePlugin = Plugins.deducer(allPlugins) lazy val log = Logger.Null - trait EmptyAutoPlugin extends AutoPlugin { - def requires = empty - def trigger = noTrigger - } - object A extends EmptyAutoPlugin - object B extends EmptyAutoPlugin + object A extends AutoPlugin + object B extends AutoPlugin object Q extends AutoPlugin { - def requires: Plugins = A && B - def trigger = allRequirements + override def requires: Plugins = A && B + override def trigger = allRequirements } object R extends AutoPlugin { - def requires = Q - def trigger = allRequirements + override def requires = Q + override def trigger = allRequirements } object S extends AutoPlugin { - def requires = Q && !R - def trigger = allRequirements + override def requires = Q && !R + override def trigger = allRequirements } // This is an opt-in plugin with a requirement // Unless explicitly loaded by the build user, this will not be activated. object T extends AutoPlugin { - def requires = Q && !R - def trigger = noTrigger + override def requires = Q && !R } // This is an opt-in plugin with a requirement // Unless explicitly loaded by the build user, this will not be activated. object U extends AutoPlugin { - def requires = A && !Q - def trigger = noTrigger + override def requires = A && !Q } }