From 33cfe8101950721f5756207504162b566c438ba8 Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Tue, 5 May 2020 17:41:06 -0700 Subject: Update scalatest 3.1.1 (#1430) * Update scalatest to 3.1.1 * Update scalatest to 3.1.1 * Update scalatest to 3.1.1 * Add missing org.scalatest.flatspec.AnyFlatSpec import. Co-authored-by: Scala Steward Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com>--- src/test/scala/chiselTests/ChiselSpec.scala | 3 ++- src/test/scala/chiselTests/stage/ChiselStageSpec.scala | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala index 31d6d322..801dbac2 100644 --- a/src/test/scala/chiselTests/ChiselSpec.scala +++ b/src/test/scala/chiselTests/ChiselSpec.scala @@ -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._ @@ -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 diff --git a/src/test/scala/chiselTests/stage/ChiselStageSpec.scala b/src/test/scala/chiselTests/stage/ChiselStageSpec.scala index b14d79a1..a7a405f1 100644 --- a/src/test/scala/chiselTests/stage/ChiselStageSpec.scala +++ b/src/test/scala/chiselTests/stage/ChiselStageSpec.scala @@ -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 { @@ -18,7 +19,7 @@ object ChiselStageSpec { } -class ChiselStageSpec extends FlatSpec with Matchers { +class ChiselStageSpec extends AnyFlatSpec with Matchers { import ChiselStageSpec._ -- cgit v1.2.3