Merge pull request #59 from ucb-bar/testing-improvements

Further testing improvements

1 files changed, 5 insertions, 4 deletions

diff --git a/src/test/scala/chiselTests/Counter.scala b/src/test/scala/chiselTests/Counter.scala
index 080130df..1aa2aaba 100644
--- a/src/test/scala/chiselTests/Counter.scala
+++ b/src/test/scala/chiselTests/Counter.scala
@@ -8,17 +8,18 @@ import Chisel.testers.BasicTester
 
 class CountTester(max: Int) extends BasicTester {
   val cnt = Counter(max)
-  when(cnt.value === UInt(max)) { io.done := Bool(true) }
+  when(Bool(true)) { cnt.inc() }
+  when(cnt.value === UInt(max-1)) { io.done := Bool(true) }
 }
 
 class EnableTester(seed: Int) extends BasicTester {
   val ens = Reg(init = UInt(seed))
   ens := ens >> 1
   val (cntEn, cntWrap) = Counter(ens(0), 32)
-  val cnt = Counter(32)
-  when(cnt.value === UInt(31)) {
+  val cnt = Counter(Bool(true), 32)._1
+  when(cnt === UInt(31)) {
     io.done := Bool(true)
-    io.error := cnt.value != UInt(popCount(seed))
+    io.error := cnt != UInt(popCount(seed))
   }
 }