diff options
Diffstat (limited to 'src/test/scala/firrtlTests/options')
9 files changed, 27 insertions, 18 deletions
diff --git a/src/test/scala/firrtlTests/options/OptionParserSpec.scala b/src/test/scala/firrtlTests/options/OptionParserSpec.scala index 1d055801..b8efbdb6 100644 --- a/src/test/scala/firrtlTests/options/OptionParserSpec.scala +++ b/src/test/scala/firrtlTests/options/OptionParserSpec.scala @@ -8,9 +8,10 @@ import firrtl.options.{DoNotTerminateOnExit, DuplicateHandling, ExceptOnError, O import scopt.OptionParser -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class OptionParserSpec extends FlatSpec with Matchers with firrtl.testutils.Utils { +class OptionParserSpec extends AnyFlatSpec with Matchers with firrtl.testutils.Utils { case class IntAnnotation(x: Int) extends NoTargetAnnotation { def extract: Int = x diff --git a/src/test/scala/firrtlTests/options/OptionsViewSpec.scala b/src/test/scala/firrtlTests/options/OptionsViewSpec.scala index 0953027f..0c868cb2 100644 --- a/src/test/scala/firrtlTests/options/OptionsViewSpec.scala +++ b/src/test/scala/firrtlTests/options/OptionsViewSpec.scala @@ -2,13 +2,14 @@ package firrtlTests.options -import org.scalatest.{FlatSpec, Matchers} import firrtl.options.OptionsView import firrtl.AnnotationSeq import firrtl.annotations.{Annotation,NoTargetAnnotation} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class OptionsViewSpec extends FlatSpec with Matchers { +class OptionsViewSpec extends AnyFlatSpec with Matchers { /* Annotations */ case class NameAnnotation(name: String) extends NoTargetAnnotation diff --git a/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala b/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala index 744d621e..f9e4b444 100644 --- a/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala +++ b/src/test/scala/firrtlTests/options/PhaseManagerSpec.scala @@ -2,7 +2,6 @@ package firrtlTests.options -import org.scalatest.{FlatSpec, Matchers} import firrtl.AnnotationSeq import firrtl.options.{DependencyManagerException, Phase, PhaseManager, PreservesAll, Dependency} @@ -10,6 +9,8 @@ import firrtl.options.{DependencyManagerException, Phase, PhaseManager, Preserve import java.io.{File, PrintWriter} import sys.process._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers trait IdentityPhase extends Phase { def transform(annotations: AnnotationSeq): AnnotationSeq = annotations @@ -381,7 +382,7 @@ object OrderingFixture { } -class PhaseManagerSpec extends FlatSpec with Matchers { +class PhaseManagerSpec extends AnyFlatSpec with Matchers { def writeGraphviz(pm: PhaseManager, dir: String): Unit = { diff --git a/src/test/scala/firrtlTests/options/RegistrationSpec.scala b/src/test/scala/firrtlTests/options/RegistrationSpec.scala index 00b705df..41b5bbf6 100644 --- a/src/test/scala/firrtlTests/options/RegistrationSpec.scala +++ b/src/test/scala/firrtlTests/options/RegistrationSpec.scala @@ -2,7 +2,8 @@ package firrtlTests.options -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import java.util.ServiceLoader import firrtl.options.{RegisteredTransform, RegisteredLibrary, ShellOption} @@ -33,7 +34,7 @@ class BarLibrary extends RegisteredLibrary { helpText = "World option") ) } -class RegistrationSpec extends FlatSpec with Matchers { +class RegistrationSpec extends AnyFlatSpec with Matchers { behavior of "RegisteredTransform" diff --git a/src/test/scala/firrtlTests/options/ShellSpec.scala b/src/test/scala/firrtlTests/options/ShellSpec.scala index 50000550..af6b2669 100644 --- a/src/test/scala/firrtlTests/options/ShellSpec.scala +++ b/src/test/scala/firrtlTests/options/ShellSpec.scala @@ -2,12 +2,13 @@ package firrtlTests.options -import org.scalatest.{FlatSpec, Matchers} import firrtl.annotations.NoTargetAnnotation import firrtl.options.Shell +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ShellSpec extends FlatSpec with Matchers { +class ShellSpec extends AnyFlatSpec with Matchers { case object A extends NoTargetAnnotation case object B extends NoTargetAnnotation diff --git a/src/test/scala/firrtlTests/options/phases/AddDefaultsSpec.scala b/src/test/scala/firrtlTests/options/phases/AddDefaultsSpec.scala index 362d139f..3401a408 100644 --- a/src/test/scala/firrtlTests/options/phases/AddDefaultsSpec.scala +++ b/src/test/scala/firrtlTests/options/phases/AddDefaultsSpec.scala @@ -2,12 +2,13 @@ package firrtlTests.options.phases -import org.scalatest.{FlatSpec, Matchers} import firrtl.options.{Phase, TargetDirAnnotation} import firrtl.options.phases.AddDefaults +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class AddDefaultsSpec extends FlatSpec with Matchers { +class AddDefaultsSpec extends AnyFlatSpec with Matchers { class Fixture { val phase: Phase = new AddDefaults diff --git a/src/test/scala/firrtlTests/options/phases/ChecksSpec.scala b/src/test/scala/firrtlTests/options/phases/ChecksSpec.scala index b988f838..96d6569d 100644 --- a/src/test/scala/firrtlTests/options/phases/ChecksSpec.scala +++ b/src/test/scala/firrtlTests/options/phases/ChecksSpec.scala @@ -2,13 +2,14 @@ package firrtlTests.options.phases -import org.scalatest.{FlatSpec, Matchers} import firrtl.AnnotationSeq import firrtl.options.{OptionsException, OutputAnnotationFileAnnotation, Phase, TargetDirAnnotation} import firrtl.options.phases.Checks +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ChecksSpec extends FlatSpec with Matchers { +class ChecksSpec extends AnyFlatSpec with Matchers { val targetDir = TargetDirAnnotation("foo") val annoOut = OutputAnnotationFileAnnotation("bar") diff --git a/src/test/scala/firrtlTests/options/phases/GetIncludesSpec.scala b/src/test/scala/firrtlTests/options/phases/GetIncludesSpec.scala index defda6c0..7d20ac89 100644 --- a/src/test/scala/firrtlTests/options/phases/GetIncludesSpec.scala +++ b/src/test/scala/firrtlTests/options/phases/GetIncludesSpec.scala @@ -2,7 +2,6 @@ package firrtlTests.options.phases -import org.scalatest.{FlatSpec, Matchers} import java.io.{File, PrintWriter} @@ -12,6 +11,8 @@ import firrtl.annotations.{AnnotationFileNotFoundException, JsonProtocol, import firrtl.options.phases.GetIncludes import firrtl.options.{InputAnnotationFileAnnotation, Phase} import firrtl.util.BackendCompilationUtilities +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers case object A extends NoTargetAnnotation case object B extends NoTargetAnnotation @@ -19,7 +20,7 @@ case object C extends NoTargetAnnotation case object D extends NoTargetAnnotation case object E extends NoTargetAnnotation -class GetIncludesSpec extends FlatSpec with Matchers with BackendCompilationUtilities with firrtl.testutils.Utils { +class GetIncludesSpec extends AnyFlatSpec with Matchers with BackendCompilationUtilities with firrtl.testutils.Utils { val dir = new File("test_run_dir/GetIncludesSpec") dir.mkdirs() diff --git a/src/test/scala/firrtlTests/options/phases/WriteOutputAnnotationsSpec.scala b/src/test/scala/firrtlTests/options/phases/WriteOutputAnnotationsSpec.scala index 176362cc..e71eaedf 100644 --- a/src/test/scala/firrtlTests/options/phases/WriteOutputAnnotationsSpec.scala +++ b/src/test/scala/firrtlTests/options/phases/WriteOutputAnnotationsSpec.scala @@ -2,7 +2,6 @@ package firrtlTests.options.phases -import org.scalatest.{FlatSpec, Matchers} import java.io.File @@ -10,8 +9,10 @@ import firrtl.AnnotationSeq import firrtl.annotations.{DeletedAnnotation, NoTargetAnnotation} import firrtl.options.{InputAnnotationFileAnnotation, OutputAnnotationFileAnnotation, Phase, WriteDeletedAnnotation} import firrtl.options.phases.{GetIncludes, WriteOutputAnnotations} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class WriteOutputAnnotationsSpec extends FlatSpec with Matchers with firrtl.testutils.Utils { +class WriteOutputAnnotationsSpec extends AnyFlatSpec with Matchers with firrtl.testutils.Utils { val dir = "test_run_dir/WriteOutputAnnotationSpec" |