diff options
| author | ducky | 2018-01-19 19:19:43 -0800 |
|---|---|---|
| committer | Richard Lin | 2018-01-19 21:39:36 -0800 |
| commit | 70ca35b9d7b3884e5f701d49bc5286f89701fd14 (patch) | |
| tree | 018a4d886b146e326c7dbabf51056a71dd6ccd7d /src/test/scala/examples | |
| parent | 6b277ff0c3266e9b02fe9b483086ab46085202ce (diff) | |
Fix deprecations in tests
Diffstat (limited to 'src/test/scala/examples')
| -rw-r--r-- | src/test/scala/examples/SimpleVendingMachine.scala | 6 | ||||
| -rw-r--r-- | src/test/scala/examples/VendingMachineGenerator.scala | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/scala/examples/SimpleVendingMachine.scala b/src/test/scala/examples/SimpleVendingMachine.scala index a34a7051..4bb6027a 100644 --- a/src/test/scala/examples/SimpleVendingMachine.scala +++ b/src/test/scala/examples/SimpleVendingMachine.scala @@ -75,9 +75,9 @@ class SimpleVendingMachineTester(mod: => SimpleVendingMachine) extends BasicTest val (cycle, done) = Counter(true.B, 10) when (done) { stop(); stop() } // Stop twice because of Verilator - val nickelInputs = Vec(true.B, true.B, true.B, true.B, true.B, false.B, false.B, false.B, true.B, false.B) - val dimeInputs = Vec(false.B, false.B, false.B, false.B, false.B, true.B, true.B, false.B, false.B, true.B) - val expected = Vec(false.B, false.B, false.B, false.B, true.B , false.B, false.B, true.B, false.B, false.B) + val nickelInputs = VecInit(true.B, true.B, true.B, true.B, true.B, false.B, false.B, false.B, true.B, false.B) + val dimeInputs = VecInit(false.B, false.B, false.B, false.B, false.B, true.B, true.B, false.B, false.B, true.B) + val expected = VecInit(false.B, false.B, false.B, false.B, true.B , false.B, false.B, true.B, false.B, false.B) dut.io.nickel := nickelInputs(cycle) dut.io.dime := dimeInputs(cycle) diff --git a/src/test/scala/examples/VendingMachineGenerator.scala b/src/test/scala/examples/VendingMachineGenerator.scala index 0a9dc3e6..c222ca07 100644 --- a/src/test/scala/examples/VendingMachineGenerator.scala +++ b/src/test/scala/examples/VendingMachineGenerator.scala @@ -84,11 +84,11 @@ class ParameterizedVendingMachineTester( val inputs: Seq[Option[Coin]] = Seq.fill(testLength)(coins.lift(_rand.nextInt(coins.size + 1))) val expected: Seq[Boolean] = getExpectedResults(inputs, dut.sodaCost) - val inputVec: Vec[UInt] = Vec(inputs map { + val inputVec: Vec[UInt] = VecInit(inputs map { case Some(coin) => (1 << dut.io.indexMap(coin.name)).asUInt(coins.size.W) case None => 0.asUInt(coins.size.W) }) - val expectedVec: Vec[Bool] = Vec(expected map (_.B)) + val expectedVec: Vec[Bool] = VecInit(expected map (_.B)) val (idx, done) = Counter(true.B, testLength + 1) when (done) { stop(); stop() } // Two stops for Verilator |