diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | build.sc | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtl/testutils/PassTests.scala | 1 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/CompilerTests.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/DriverSpec.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/options/RegistrationSpec.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala | 2 |
7 files changed, 11 insertions, 2 deletions
@@ -48,7 +48,7 @@ lazy val commonSettings = Seq( javacOptions ++= javacOptionsVersion(scalaVersion.value), libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "org.scalatest" %% "scalatest" % "3.1.0" % "test", + "org.scalatest" %% "scalatest" % "3.1.1" % "test", "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.1" % "test", "com.github.scopt" %% "scopt" % "3.7.1", "net.jcazevedo" %% "moultingyaml" % "0.4.1", @@ -59,7 +59,7 @@ class firrtlCrossModule(crossVersion: String) extends ScalaModule with SbtModule } def ivyDeps = Agg( - ivy"org.scalatest::scalatest:3.1.0", + ivy"org.scalatest::scalatest:3.1.1", ivy"org.scalatestplus::scalacheck-1-14:3.1.0.1" ) ++ ivyCrossDeps diff --git a/src/test/scala/firrtl/testutils/PassTests.scala b/src/test/scala/firrtl/testutils/PassTests.scala index f8e1b845..49dea199 100644 --- a/src/test/scala/firrtl/testutils/PassTests.scala +++ b/src/test/scala/firrtl/testutils/PassTests.scala @@ -10,6 +10,7 @@ import firrtl.stage.Forms import firrtl._ import firrtl.annotations._ import logger._ +import org.scalatest.flatspec.AnyFlatSpec // An example methodology for testing Firrtl Passes // Spec class should extend this class diff --git a/src/test/scala/firrtlTests/CompilerTests.scala b/src/test/scala/firrtlTests/CompilerTests.scala index f1255721..1d3e3174 100644 --- a/src/test/scala/firrtlTests/CompilerTests.scala +++ b/src/test/scala/firrtlTests/CompilerTests.scala @@ -17,6 +17,8 @@ import firrtl.{ Parser, VerilogCompiler } +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** * An example methodology for testing Firrtl compilers. diff --git a/src/test/scala/firrtlTests/DriverSpec.scala b/src/test/scala/firrtlTests/DriverSpec.scala index cd644041..92381e8c 100644 --- a/src/test/scala/firrtlTests/DriverSpec.scala +++ b/src/test/scala/firrtlTests/DriverSpec.scala @@ -16,6 +16,8 @@ import firrtl.util.BackendCompilationUtilities import firrtl.testutils.FirrtlFlatSpec import scala.util.Success +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers class ExceptingTransform extends Transform { def inputForm = HighForm diff --git a/src/test/scala/firrtlTests/options/RegistrationSpec.scala b/src/test/scala/firrtlTests/options/RegistrationSpec.scala index 41b5bbf6..fa6b0fa0 100644 --- a/src/test/scala/firrtlTests/options/RegistrationSpec.scala +++ b/src/test/scala/firrtlTests/options/RegistrationSpec.scala @@ -10,6 +10,8 @@ import firrtl.options.{RegisteredTransform, RegisteredLibrary, ShellOption} import firrtl.passes.Pass import firrtl.ir.Circuit import firrtl.annotations.NoTargetAnnotation +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers case object HelloAnnotation extends NoTargetAnnotation diff --git a/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala b/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala index 9529507d..bd6d3ac7 100644 --- a/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala +++ b/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala @@ -12,6 +12,8 @@ import firrtl.FileUtils import firrtl.stage.FirrtlMain import firrtl.util.BackendCompilationUtilities +import org.scalatest.featurespec.AnyFeatureSpec +import org.scalatest.matchers.should.Matchers /** Testing for the top-level [[FirrtlStage]] via [[FirrtlMain]]. * |