From ee599da45bd37acc9d2a23dd29cf6edffc355bda Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Thu, 25 May 2017 18:41:16 -0700 Subject: Support updated scalatest/scalacheck; bump sbt and Scala versions. (#605) bump scoverage version--- src/test/scala/chiselTests/ChiselSpec.scala | 2 +- src/test/scala/chiselTests/Direction.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala index 143a1495..14672d68 100644 --- a/src/test/scala/chiselTests/ChiselSpec.scala +++ b/src/test/scala/chiselTests/ChiselSpec.scala @@ -68,7 +68,7 @@ class ChiselPropSpec extends PropSpec with ChiselRunners with PropertyChecks wit // Constrain the default number of instances generated for every use of forAll. implicit override val generatorDrivenConfig = - PropertyCheckConfig(minSuccessful = 8, minSize = 1, maxSize = 4) + PropertyCheckConfiguration(minSuccessful = 8, minSize = 1, sizeRange = 3) // Generator for small positive integers. val smallPosInts = Gen.choose(1, 4) diff --git a/src/test/scala/chiselTests/Direction.scala b/src/test/scala/chiselTests/Direction.scala index c3400013..83ef7088 100644 --- a/src/test/scala/chiselTests/Direction.scala +++ b/src/test/scala/chiselTests/Direction.scala @@ -4,6 +4,7 @@ package chiselTests import chisel3._ import org.scalatest._ +import org.scalatest.matchers._ import org.scalatest.prop._ import chisel3.testers.BasicTester @@ -22,7 +23,7 @@ class BadDirection extends DirectionHaver { io.in := 0.U } -class DirectionSpec extends ChiselPropSpec with ShouldMatchers { +class DirectionSpec extends ChiselPropSpec with Matchers { //TODO: In Chisel3 these are actually FIRRTL errors. Remove from tests? -- cgit v1.2.3