From 1cf983628ba48040d35e5db26a81e8918208e9d7 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Wed, 26 Feb 2025 13:53:47 -0500 Subject: [PATCH] [test] Remove ChiselRunners Remove ChiselRunners now that it is empty (other than mixing in `Assertions`, which is not used). Signed-off-by: Schuyler Eldridge --- src/test/scala-2/chiselTests/ChiselSpec.scala | 11 ++++------- .../chiselTests/experimental/hierarchy/Utils.scala | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/scala-2/chiselTests/ChiselSpec.scala b/src/test/scala-2/chiselTests/ChiselSpec.scala index 811c43be8f..d44da7f4a8 100644 --- a/src/test/scala-2/chiselTests/ChiselSpec.scala +++ b/src/test/scala-2/chiselTests/ChiselSpec.scala @@ -31,9 +31,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import chisel3.reflect.DataMirror -/** Common utility functions for Chisel unit tests. */ -sealed trait ChiselRunners extends Assertions - trait WidthHelpers extends Assertions { def assertKnownWidth(expected: Int, args: Iterable[String] = Nil)(gen: => Data)(implicit pos: Position): Unit = { @@ -136,13 +133,13 @@ trait FileCheck extends BeforeAndAfterEachTestData { this: Suite => } /** Spec base class for BDD-style testers. */ -abstract class ChiselFlatSpec extends AnyFlatSpec with ChiselRunners with Matchers +abstract class ChiselFlatSpec extends AnyFlatSpec with Matchers /** Spec base class for BDD-style testers. */ -abstract class ChiselFreeSpec extends AnyFreeSpec with ChiselRunners with Matchers +abstract class ChiselFreeSpec extends AnyFreeSpec with Matchers /** Spec base class for BDD-style testers. */ -abstract class ChiselFunSpec extends AnyFunSpec with ChiselRunners with Matchers +abstract class ChiselFunSpec extends AnyFunSpec with Matchers /** Utilities for writing property-based checks */ trait PropertyUtils extends ScalaCheckPropertyChecks { @@ -212,7 +209,7 @@ trait PropertyUtils extends ScalaCheckPropertyChecks { } /** Spec base class for property-based testers. */ -abstract class ChiselPropSpec extends AnyPropSpec with ChiselRunners with PropertyUtils with Matchers +abstract class ChiselPropSpec extends AnyPropSpec with PropertyUtils with Matchers trait Utils { diff --git a/src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala b/src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala index c6780d62c1..2b486cb39d 100644 --- a/src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala +++ b/src/test/scala-2/chiselTests/experimental/hierarchy/Utils.scala @@ -3,7 +3,6 @@ package chiselTests.experimental.hierarchy import _root_.firrtl.annotations._ -import chiselTests.ChiselRunners import org.scalatest.matchers.should.Matchers trait Utils extends chiselTests.Utils with Matchers {