Merge pull request #1534 from freechipsproject/deprecate-transform-2

Trait-base Dependency API Migration

1 files changed, 12 insertions, 5 deletions

diff --git a/src/test/scala/firrtlTests/AnnotationTests.scala b/src/test/scala/firrtlTests/AnnotationTests.scala
index 31ee9680..a898d216 100644
--- a/src/test/scala/firrtlTests/AnnotationTests.scala
+++ b/src/test/scala/firrtlTests/AnnotationTests.scala
@@ -35,9 +35,21 @@ trait AnnotationSpec extends LowTransformSpec {
   }
 }
 
+object AnnotationTests {
+
+  class DeletingTransform extends Transform {
+    val inputForm = LowForm
+    val outputForm = LowForm
+    def execute(state: CircuitState) = state.copy(annotations = Seq())
+  }
+
+}
+
 // Abstract but with lots of tests defined so that we can use the same tests
 // for Legacy and newer Annotations
 abstract class AnnotationTests extends AnnotationSpec with Matchers {
+  import AnnotationTests._
+
   def anno(s: String, value: String ="this is a value", mod: String = "Top"): Annotation
   def manno(mod: String): Annotation
 
@@ -59,11 +71,6 @@ abstract class AnnotationTests extends AnnotationSpec with Matchers {
         |  module Top :
         |    input in: UInt<3>
         |""".stripMargin
-    class DeletingTransform extends Transform {
-      val inputForm = LowForm
-      val outputForm = LowForm
-      def execute(state: CircuitState) = state.copy(annotations = Seq())
-    }
     val transform = new DeletingTransform
     val tname = transform.name
     val inlineAnn = InlineAnnotation(CircuitName("Top"))