remove scalatest

ucb-bar · Jan 7, 2022 · 005d688 · 005d688
1 parent 8dabea2
commit 005d688
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 55 deletions.
diff --git a/src/main/scala/dsptools/dspmath/Factorization.scala b/src/main/scala/dsptools/dspmath/Factorization.scala
@@ -2,9 +2,6 @@
 
 package dsptools.dspmath
 
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
-
 case class RadPow(rad: Int, pow: Int) {
   /** `r ^ p` */
   def get: Int = BigInt(rad).pow(pow).toInt

diff --git a/src/test/scala/dsptools/BaseNSpec.scala b/src/test/scala/dsptools/BaseNSpec.scala
@@ -3,8 +3,8 @@
 package dsptools
 
 import chisel3._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 //scalastyle:off magic.number
 

diff --git a/src/test/scala/dsptools/DspContextSpec.scala b/src/test/scala/dsptools/DspContextSpec.scala
@@ -4,8 +4,8 @@ package dsptools
 
 import chisel3._
 import dsptools.numbers._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 import scala.collection.parallel.CollectionConverters.RangeIsParallelizable
 

diff --git a/src/test/scala/dsptools/DspTesterSpec.scala b/src/test/scala/dsptools/DspTesterSpec.scala
@@ -3,8 +3,8 @@
 package dsptools
 
 import DspTesterUtilities._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 import scala.math.{pow, abs}
 
 class DspTesterSpec {

diff --git a/src/test/scala/dsptools/LoggingSpec.scala b/src/test/scala/dsptools/LoggingSpec.scala
@@ -4,8 +4,8 @@ package dsptools
 
 import chisel3._
 import logger.{LazyLogging, LogLevel, Logger}
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class DutWithLogging extends Module with LazyLogging {
   val io = IO(new Bundle {})

diff --git a/src/test/scala/dsptools/ShiftRegisterDelaySpec.scala b/src/test/scala/dsptools/ShiftRegisterDelaySpec.scala
@@ -5,8 +5,8 @@ package dsptools
 import chisel3._
 import chisel3.experimental.FixedPoint
 import dsptools.numbers._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 import scala.collection.mutable
 

diff --git a/src/test/scala/dsptools/VerboseDspTesterSpec/SimpleTBwGenTypeOption.scala b/src/test/scala/dsptools/VerboseDspTesterSpec/SimpleTBwGenTypeOption.scala
@@ -9,8 +9,8 @@ import chisel3.experimental.FixedPoint
 import breeze.math.Complex
 import dsptools.{DspTester, DspTesterOptionsManager, DspTesterOptions}
 import dsptools.numbers._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 import chisel3.iotesters.TesterOptions
 
 trait EasyPeekPoke {

diff --git a/src/test/scala/dsptools/numbers/AbsSpec.scala b/src/test/scala/dsptools/numbers/AbsSpec.scala
@@ -5,8 +5,8 @@ package dsptools.numbers
 import chisel3._
 import chisel3.experimental._
 import dsptools.{DspContext, DspTester, Grow, Wrap}
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class AbsSpec extends AnyFreeSpec with Matchers {
   "absolute value should work for all types" - {

diff --git a/src/test/scala/dsptools/numbers/BaseNSpec.scala b/src/test/scala/dsptools/numbers/BaseNSpec.scala
@@ -3,8 +3,8 @@
 package dsptools.numbers
 
 import dsptools.numbers.representations.BaseN
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class BaseNSpec extends AnyFlatSpec with Matchers {
   behavior of "BaseN"

diff --git a/src/test/scala/dsptools/numbers/FixedPointSpec.scala b/src/test/scala/dsptools/numbers/FixedPointSpec.scala
@@ -10,8 +10,8 @@ import chisel3.iotesters.ChiselPropSpec
 import chisel3.testers.BasicTester
 import dsptools.DspTester
 import dsptools.numbers.implicits._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class FixedRing1(val width: Int, val binaryPoint: Int) extends Module {
   val io = IO(new Bundle {

diff --git a/src/test/scala/dsptools/numbers/FixedPrecisionChangerSpec.scala b/src/test/scala/dsptools/numbers/FixedPrecisionChangerSpec.scala
@@ -5,8 +5,8 @@ package dsptools.numbers
 import chisel3._
 import chisel3.experimental.FixedPoint
 import dsptools.DspTester
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 //scalastyle:off magic.number
 

diff --git a/src/test/scala/dsptools/numbers/IntervalSpec.scala b/src/test/scala/dsptools/numbers/IntervalSpec.scala
@@ -9,8 +9,8 @@ import chisel3.experimental._
 import chisel3.internal.firrtl.IntervalRange
 import dsptools.DspTester
 import dsptools.numbers.implicits._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class IntervalRing1(val width: Int, val binaryPoint: Int) extends Module {
   val range = IntervalRange(width.W, binaryPoint.BP)

diff --git a/src/test/scala/dsptools/numbers/LnSpec.scala b/src/test/scala/dsptools/numbers/LnSpec.scala
@@ -7,8 +7,8 @@ import chisel3.util._
 import chisel3.testers.BasicTester
 import chisel3.iotesters.{ChiselFlatSpec, PeekPokeTester, TesterOptionsManager}
 import dsptools.{DspTester, ReplOptionsManager}
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class LnModule extends Module {
   val io = IO(new Bundle {

diff --git a/src/test/scala/dsptools/numbers/NumbersSpec.scala b/src/test/scala/dsptools/numbers/NumbersSpec.scala
@@ -6,8 +6,8 @@ import chisel3._
 import dsptools._
 import chisel3.experimental.FixedPoint
 import dsptools.numbers.implicits._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 /**
   * This will attempt to follow the dsptools.numbers.README.md file as close as possible.

diff --git a/src/test/scala/dsptools/numbers/OverflowSpec.scala b/src/test/scala/dsptools/numbers/OverflowSpec.scala
@@ -2,8 +2,8 @@
 
 package dsptools.numbers
 
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class OverflowSpec extends AnyFreeSpec with Matchers {
 

diff --git a/src/test/scala/dsptools/numbers/ParameterizedOpSpec.scala b/src/test/scala/dsptools/numbers/ParameterizedOpSpec.scala
@@ -7,8 +7,8 @@ import chisel3._
 import chisel3.experimental.FixedPoint
 import chisel3.iotesters.TesterOptionsManager
 import dsptools.DspTester
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 import dsptools.numbers._
 import dsptools._
 

diff --git a/src/test/scala/dsptools/numbers/SaturateSpec.scala b/src/test/scala/dsptools/numbers/SaturateSpec.scala
@@ -6,8 +6,8 @@ import chisel3._
 import chisel3.experimental.FixedPoint
 import chisel3.iotesters._
 import dsptools.numbers.rounding.Saturate
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class SaturateUIntMod(val add: Boolean) extends MultiIOModule {
   val a = IO(Input(UInt(8.W)))

diff --git a/src/test/scala/dsptools/numbers/TypeclassSpec.scala b/src/test/scala/dsptools/numbers/TypeclassSpec.scala
@@ -7,8 +7,8 @@ import chisel3.experimental.FixedPoint
 import chisel3.iotesters._
 import dsptools._
 import dsptools.numbers._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 /*
  * These tests mostly exist to ensure that expressions of the form

diff --git a/src/test/scala/examples/CaseClassBundleSpec.scala b/src/test/scala/examples/CaseClassBundleSpec.scala
@@ -4,8 +4,8 @@ package examples
 
 import chisel3._
 import chisel3.iotesters.PeekPokeTester
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 //scalastyle:off magic.number
 

diff --git a/src/test/scala/examples/ComplexMultiplierSpec.scala b/src/test/scala/examples/ComplexMultiplierSpec.scala
@@ -8,8 +8,8 @@ import chisel3.iotesters.Backend
 import chisel3.{Bundle, Module}
 import dsptools.{DspContext, DspTester}
 import dsptools.numbers._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 import spire.algebra.Ring
 
 //scalastyle:off magic.number

diff --git a/src/test/scala/examples/ParameterizedAdderSpec.scala b/src/test/scala/examples/ParameterizedAdderSpec.scala
@@ -6,8 +6,8 @@ import chisel3._
 import chisel3.experimental.FixedPoint
 import dsptools.DspTester
 import dsptools.numbers._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 //scalastyle:off magic.number
 

diff --git a/src/test/scala/examples/ParameterizedSaturatingAdder.scala b/src/test/scala/examples/ParameterizedSaturatingAdder.scala
@@ -5,8 +5,8 @@ package examples
 import chisel3._
 import dsptools.{DspContext, DspTester, Saturate}
 import dsptools.numbers._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class ParameterizedSaturatingAdder[T <: Data:Integer](gen:() => T) extends Module {
   val io = IO(new Bundle {

diff --git a/src/test/scala/examples/RealAdderSpec.scala b/src/test/scala/examples/RealAdderSpec.scala
@@ -5,8 +5,8 @@ package examples
 import chisel3._
 import dsptools.{DspTester, ReplOptionsManager}
 import dsptools.numbers.DspReal
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 import scala.math.BigDecimal
 

diff --git a/src/test/scala/examples/SimpleAdderSpec.scala b/src/test/scala/examples/SimpleAdderSpec.scala
@@ -5,8 +5,8 @@ package examples
 import chisel3._
 import chisel3.experimental.FixedPoint
 import dsptools.DspTester
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 class SimpleAdder extends Module {
   val io = IO(new Bundle {

diff --git a/src/test/scala/examples/SimpleDspModuleSpec.scala b/src/test/scala/examples/SimpleDspModuleSpec.scala
@@ -15,8 +15,8 @@ import dsptools.{DspTester, DspTesterOptionsManager, DspTesterOptions}
 // Allows you to modify default Chisel tester behavior (note that DspTester is a special version of Chisel tester)
 import iotesters.TesterOptions
 // Scala unit testing style
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 // IO Bundle. Note that when you parameterize the bundle, you MUST override cloneType.
 // This also creates x, y, z inputs/outputs (direction must be specified at some IO hierarchy level)

diff --git a/src/test/scala/examples/StreamingAutocorrelatorSpec.scala b/src/test/scala/examples/StreamingAutocorrelatorSpec.scala
@@ -7,8 +7,8 @@ package examples
 import chisel3._
 import chisel3.iotesters.PeekPokeTester
 import dsptools.numbers.implicits._
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 
 import spire.algebra.{Ring, Field}
 

diff --git a/src/test/scala/examples/TransposedStreamFIRSpec.scala b/src/test/scala/examples/TransposedStreamFIRSpec.scala
@@ -8,8 +8,8 @@ import chisel3._
 import chisel3.iotesters.{PeekPokeTester, TesterOptions}
 import dsptools.numbers.implicits._
 import dsptools.{DspContext, Grow}
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
+
+
 import dsptools.examples.{ConstantTapTransposedStreamingFIR, TransposedStreamingFIR}
 import spire.algebra.{Field, Ring}