From 70ca35b9d7b3884e5f701d49bc5286f89701fd14 Mon Sep 17 00:00:00 2001
From: ducky
Date: Fri, 19 Jan 2018 19:19:43 -0800
Subject: Fix deprecations in tests

---
 src/test/scala/examples/SimpleVendingMachine.scala    | 6 +++---
 src/test/scala/examples/VendingMachineGenerator.scala | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test/scala/examples')

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
-- 
cgit v1.2.3