diff options
| author | Jim Lawson | 2020-03-25 09:35:21 -0700 |
|---|---|---|
| committer | GitHub | 2020-03-25 16:35:21 +0000 |
| commit | 9995f081291d974a6b5ad319e67a9d19cdc4a56d (patch) | |
| tree | 351bcbc4cedc97ffbb219f043c4961e52d12ada7 /src/test/scala/firrtl/testutils | |
| parent | bdac6e1c55694f1562a56b2eb0716733bd2f1fc0 (diff) | |
Update scalatest 3.1.0 (#1383)
* Removed unused imports in src/test/
* Update ScalaTest deprecations.
* Update scalatest from 3.0.8 to 3.1.0; apply auto fix for deprecations
Co-authored-by: Jack Koenig <koenig@sifive.com>
Diffstat (limited to 'src/test/scala/firrtl/testutils')
| -rw-r--r-- | src/test/scala/firrtl/testutils/FirrtlSpec.scala | 7 | ||||
| -rw-r--r-- | src/test/scala/firrtl/testutils/PassTests.scala | 4 |
2 files changed, 7 insertions, 4 deletions
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) |