From e1bdf1eea5b00917b26bea24b25b3911a56fe849 Mon Sep 17 00:00:00 2001
From: Henry Cook
Date: Thu, 13 Aug 2015 13:59:46 -0700
Subject: minor tweaks

---
 src/test/scala/chiselTests/BitsOps.scala    | 5 ++---
 src/test/scala/chiselTests/ChiselSpec.scala | 2 ++
 src/test/scala/chiselTests/GCD.scala        | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/test/scala/chiselTests/BitsOps.scala b/src/test/scala/chiselTests/BitsOps.scala
index 0c9128c4..7cd695e6 100644
--- a/src/test/scala/chiselTests/BitsOps.scala
+++ b/src/test/scala/chiselTests/BitsOps.scala
@@ -31,10 +31,9 @@
 package chiselTests
 
 import Chisel._
-import Chisel.testers._
 import org.scalatest._
 import org.scalatest.prop._
-import org.scalatest.prop.GeneratorDrivenPropertyChecks._
+import Chisel.testers.BasicTester
 
 class BitwiseOps(w: Int) extends Module {
   val io = new Bundle {
@@ -67,7 +66,7 @@ class BitwiseOpsSpec extends ChiselSpec {
 
   "BitwiseOps" should "return the correct result" in {
     forAll(safeUInts, safeUInts) { (a: Int, b: Int) =>
-      assert(TesterDriver.execute{ new BitwiseOpsTester(32, a, b) }) 
+      assert(execute{ new BitwiseOpsTester(32, a, b) }) 
     }
   }
 }
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala
index 299eb9af..fd602ef3 100644
--- a/src/test/scala/chiselTests/ChiselSpec.scala
+++ b/src/test/scala/chiselTests/ChiselSpec.scala
@@ -33,8 +33,10 @@ package chiselTests
 import org.scalatest._
 import org.scalatest.prop._
 import org.scalacheck._
+import Chisel.testers._
 
 class ChiselSpec extends FlatSpec with PropertyChecks {
+  def execute(t: => BasicTester): Boolean = TesterDriver.execute(t)
 
   val safeUIntWidth = Gen.choose(1, 31) 
   val safeUInts = Gen.choose(0, (1 << 30))
diff --git a/src/test/scala/chiselTests/GCD.scala b/src/test/scala/chiselTests/GCD.scala
index 7a612bc7..1ef20610 100644
--- a/src/test/scala/chiselTests/GCD.scala
+++ b/src/test/scala/chiselTests/GCD.scala
@@ -31,10 +31,9 @@
 package chiselTests
 
 import Chisel._
-import Chisel.testers._
+import Chisel.testers.BasicTester
 import org.scalatest._
 import org.scalatest.prop._
-import org.scalatest.prop.TableDrivenPropertyChecks._
 
 class GCD extends Module {
   val io = new Bundle {
@@ -76,7 +75,7 @@ class GCDSpec extends ChiselSpec {
 
   "GCD" should "return the correct result" in {
     forAll (gcds) { (a: Int, b: Int, z: Int) => 
-      assert(TesterDriver.execute{ new GCDTester(a, b, z) })
+      assert(execute{ new GCDTester(a, b, z) })
     }
   }
 }
-- 
cgit v1.2.3