diff options
Diffstat (limited to 'src/test/scala/firrtl')
4 files changed, 13 insertions, 8 deletions
diff --git a/src/test/scala/firrtl/JsonProtocolSpec.scala b/src/test/scala/firrtl/JsonProtocolSpec.scala index 57c460a8..7d04e9fc 100644 --- a/src/test/scala/firrtl/JsonProtocolSpec.scala +++ b/src/test/scala/firrtl/JsonProtocolSpec.scala @@ -2,10 +2,10 @@ package firrtlTests -import org.scalatest.FlatSpec import org.json4s._ import firrtl.annotations.{NoTargetAnnotation, JsonProtocol, InvalidAnnotationJSONException, HasSerializationHints, Annotation} +import org.scalatest.flatspec.AnyFlatSpec object JsonProtocolTestClasses { trait Parent @@ -25,7 +25,7 @@ object JsonProtocolTestClasses { import JsonProtocolTestClasses._ -class JsonProtocolSpec extends FlatSpec { +class JsonProtocolSpec extends AnyFlatSpec { def serializeAndDeserialize(anno: Annotation): Annotation = { val serializedAnno = JsonProtocol.serialize(Seq(anno)) JsonProtocol.deserialize(serializedAnno).head diff --git a/src/test/scala/firrtl/stage/phases/tests/DriverCompatibilitySpec.scala b/src/test/scala/firrtl/stage/phases/tests/DriverCompatibilitySpec.scala index 89f2ec07..64654175 100644 --- a/src/test/scala/firrtl/stage/phases/tests/DriverCompatibilitySpec.scala +++ b/src/test/scala/firrtl/stage/phases/tests/DriverCompatibilitySpec.scala @@ -2,7 +2,7 @@ package firrtl.stage.phases.tests -import org.scalatest.{FlatSpec, Matchers, PrivateMethodTester} +import org.scalatest.PrivateMethodTester import java.io.File import firrtl._ @@ -10,8 +10,10 @@ import firrtl.stage.phases.DriverCompatibility._ import firrtl.options.{InputAnnotationFileAnnotation, Phase, TargetDirAnnotation} import firrtl.stage.{CompilerAnnotation, FirrtlCircuitAnnotation, FirrtlFileAnnotation, FirrtlSourceAnnotation, OutputFileAnnotation, RunFirrtlTransformAnnotation} import firrtl.stage.phases.DriverCompatibility +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class DriverCompatibilitySpec extends FlatSpec with Matchers with PrivateMethodTester { +class DriverCompatibilitySpec extends AnyFlatSpec with Matchers with PrivateMethodTester { class PhaseFixture(val phase: Phase) diff --git a/src/test/scala/firrtl/testutils/FirrtlSpec.scala b/src/test/scala/firrtl/testutils/FirrtlSpec.scala index 46f36e87..4cc9382f 100644 --- a/src/test/scala/firrtl/testutils/FirrtlSpec.scala +++ b/src/test/scala/firrtl/testutils/FirrtlSpec.scala @@ -18,6 +18,9 @@ import firrtl.analyses.{GetNamespace, ModuleNamespaceAnnotation} import firrtl.annotations._ import firrtl.transforms.{DontTouchAnnotation, NoDedupAnnotation, RenameModules} import firrtl.util.BackendCompilationUtilities +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers +import org.scalatest.propspec.AnyPropSpec class CheckLowForm extends SeqTransform { def inputForm = LowForm @@ -255,9 +258,9 @@ object FirrtlCheckers extends FirrtlMatchers { } } -abstract class FirrtlPropSpec extends PropSpec with ScalaCheckPropertyChecks with FirrtlRunners with LazyLogging +abstract class FirrtlPropSpec extends AnyPropSpec with ScalaCheckPropertyChecks with FirrtlRunners with LazyLogging -abstract class FirrtlFlatSpec extends FlatSpec with FirrtlRunners with FirrtlMatchers with LazyLogging +abstract class FirrtlFlatSpec extends AnyFlatSpec with FirrtlRunners with FirrtlMatchers with LazyLogging // Who tests the testers? class TestFirrtlFlatSpec extends FirrtlFlatSpec { diff --git a/src/test/scala/firrtl/testutils/PassTests.scala b/src/test/scala/firrtl/testutils/PassTests.scala index c172163e..3d820003 100644 --- a/src/test/scala/firrtl/testutils/PassTests.scala +++ b/src/test/scala/firrtl/testutils/PassTests.scala @@ -2,7 +2,7 @@ package firrtl.testutils -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import firrtl.ir.Circuit import firrtl.passes.{PassExceptions, RemoveEmpty} import firrtl.transforms.DedupModules @@ -12,7 +12,7 @@ import logger._ // An example methodology for testing Firrtl Passes // Spec class should extend this class -abstract class SimpleTransformSpec extends FlatSpec with FirrtlMatchers with Compiler with LazyLogging { +abstract class SimpleTransformSpec extends AnyFlatSpec with FirrtlMatchers with Compiler with LazyLogging { // Utility function def squash(c: Circuit): Circuit = RemoveEmpty.run(c) |