summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Lawson2017-05-25 18:41:16 -0700
committerJack Koenig2017-05-25 18:41:16 -0700
commitee599da45bd37acc9d2a23dd29cf6edffc355bda (patch)
tree956e300722231c6e56c1f6d77ff1faa01bae3bd2 /src
parent0d121a2e357511e9e7d975ae5f2d316e47cbf43b (diff)
Support updated scalatest/scalacheck; bump sbt and Scala versions. (#605)
bump scoverage version
Diffstat (limited to 'src')
-rw-r--r--src/test/scala/chiselTests/ChiselSpec.scala2
-rw-r--r--src/test/scala/chiselTests/Direction.scala3
2 files changed, 3 insertions, 2 deletions
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?