scalatest: upgrade to 3.2.1 (#1831)

* scalatest: replace deprecated FlatSpec and add new Matchers import

* scalatest: 3.1.2 -> 3.2.1

2 files changed, 6 insertions, 4 deletions

diff --git a/src/test/scala/firrtlTests/annotationTests/JsonProtocolSpec.scala b/src/test/scala/firrtlTests/annotationTests/JsonProtocolSpec.scala
index d1bd1fb2..2c817c23 100644
--- a/src/test/scala/firrtlTests/annotationTests/JsonProtocolSpec.scala
+++ b/src/test/scala/firrtlTests/annotationTests/JsonProtocolSpec.scala
@@ -7,7 +7,8 @@ import firrtl.annotations.{JsonProtocol, NoTargetAnnotation}
 import firrtl.ir._
 import firrtl.options.Dependency
 import _root_.logger.{Logger, LogLevel, LogLevelAnnotation}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should._
 
 case class AnAnnotation(
     info: Info,
@@ -30,7 +31,7 @@ class AnnoInjector extends Transform with DependencyAPIMigration {
   }
 }
 
-class JsonProtocolSpec extends FlatSpec with Matchers {
+class JsonProtocolSpec extends AnyFlatSpec with Matchers {
   "JsonProtocol" should "serialize and deserialize FIRRTL types" in {
 
     val circuit =
diff --git a/src/test/scala/firrtlTests/annotationTests/MorphismSpec.scala b/src/test/scala/firrtlTests/annotationTests/MorphismSpec.scala
index cc486c99..ccf930ba 100644
--- a/src/test/scala/firrtlTests/annotationTests/MorphismSpec.scala
+++ b/src/test/scala/firrtlTests/annotationTests/MorphismSpec.scala
@@ -6,9 +6,10 @@ import firrtl._
 import firrtl.annotations.{Annotation, CircuitTarget, CompleteTarget, DeletedAnnotation}
 import firrtl.annotations.transforms.{DupedResult, ResolvePaths}
 import firrtl.transforms.DedupedResult
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should._
 
-class MorphismSpec extends FlatSpec with Matchers {
+class MorphismSpec extends AnyFlatSpec with Matchers {
 
   object AnAnnotation {
     def apply(target: CompleteTarget) = new AnAnnotation(Some(target))