diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | build.sc | 2 | ||||
| -rw-r--r-- | src/test/scala/chiselTests/ChiselSpec.scala | 5 | ||||
| -rw-r--r-- | src/test/scala/chiselTests/ExtModuleImpl.scala | 7 |
4 files changed, 8 insertions, 8 deletions
@@ -70,7 +70,7 @@ lazy val chiselSettings = Seq ( name := "chisel3", libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.1.2" % "test", + "org.scalatest" %% "scalatest" % "3.2.9" % "test", "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test", "com.lihaoyi" %% "os-lib" % "0.7.8", ), @@ -107,7 +107,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def scalacPluginClasspath = m.scalacPluginClasspath override def ivyDeps = m.ivyDeps() ++ Agg( - ivy"org.scalatest::scalatest:3.1.2", + ivy"org.scalatest::scalatest:3.2.9", ivy"org.scalatestplus::scalacheck-1-14:3.2.2.0", ) ++ m.treadleIvyDeps diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala index 37c4a2b7..a4192c5e 100644 --- a/src/test/scala/chiselTests/ChiselSpec.scala +++ b/src/test/scala/chiselTests/ChiselSpec.scala @@ -13,7 +13,8 @@ import org.scalacheck._ import org.scalatest._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.freespec.AnyFreeSpec -import org.scalatest.matchers.should._ +import org.scalatest.propspec.AnyPropSpec +import org.scalatest.matchers.should.Matchers import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks import java.io.ByteArrayOutputStream @@ -94,7 +95,7 @@ abstract class ChiselFlatSpec extends AnyFlatSpec with ChiselRunners with Matche abstract class ChiselFreeSpec extends AnyFreeSpec with ChiselRunners with Matchers /** Spec base class for property-based testers. */ -abstract class ChiselPropSpec extends PropSpec with ChiselRunners with ScalaCheckPropertyChecks with Matchers { +abstract class ChiselPropSpec extends AnyPropSpec with ChiselRunners with ScalaCheckPropertyChecks with Matchers { // Constrain the default number of instances generated for every use of forAll. implicit override val generatorDrivenConfig: PropertyCheckConfiguration = diff --git a/src/test/scala/chiselTests/ExtModuleImpl.scala b/src/test/scala/chiselTests/ExtModuleImpl.scala index e0a76201..c6cd4a9f 100644 --- a/src/test/scala/chiselTests/ExtModuleImpl.scala +++ b/src/test/scala/chiselTests/ExtModuleImpl.scala @@ -8,12 +8,11 @@ import chisel3._ import chisel3.experimental.ExtModule import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage} import chisel3.util.{HasExtModuleInline, HasExtModulePath, HasExtModuleResource} -import firrtl.FirrtlExecutionSuccess import firrtl.options.TargetDirAnnotation import firrtl.stage.FirrtlCircuitAnnotation import firrtl.transforms.BlackBoxNotFoundException -import org.scalacheck.Test.Failed -import org.scalatest.{FreeSpec, Matchers, Succeeded} +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers //scalastyle:off magic.number @@ -102,7 +101,7 @@ class UsesMissingExtModuleResource extends RawModule { val foo = Module(new ExtModuleResourceNotFound) } -class ExtModuleImplSpec extends FreeSpec with Matchers { +class ExtModuleImplSpec extends AnyFreeSpec with Matchers { "ExtModule can have verilator source implementation" - { "Implementations can be contained in-line" in { |