Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update scalatest 3.1.1 #1430

Merged
merged 11 commits into from
May 6, 2020
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ lazy val chiselSettings = Seq (
// An explicit dependency on junit seems to alleviate this.
libraryDependencies ++= Seq(
"junit" % "junit" % "4.13" % "test",
"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"
),
Expand Down
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
}

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",
ivy"com.github.scopt::scopt:3.7.1"
) ++ ivyCrossDeps
Expand Down
3 changes: 2 additions & 1 deletion src/test/scala/chiselTests/ChiselSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package chiselTests

import org.scalatest._
import org.scalatest.prop._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalacheck._
import chisel3._
import chisel3.testers._
Expand Down Expand Up @@ -94,7 +95,7 @@ trait ChiselRunners extends Assertions with BackendCompilationUtilities {
}

/** Spec base class for BDD-style testers. */
abstract class ChiselFlatSpec extends FlatSpec with ChiselRunners with Matchers
abstract class ChiselFlatSpec extends AnyFlatSpec with ChiselRunners with Matchers

class ChiselTestUtilitiesSpec extends ChiselFlatSpec {
import org.scalatest.exceptions.TestFailedException
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/chiselTests/stage/ChiselStageSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ package chiselTests.stage
import chisel3._
import chisel3.stage.ChiselStage

import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

object ChiselStageSpec {

Expand All @@ -18,7 +19,7 @@ object ChiselStageSpec {

}

class ChiselStageSpec extends FlatSpec with Matchers {
class ChiselStageSpec extends AnyFlatSpec with Matchers {

import ChiselStageSpec._

Expand Down