fixup! [testing] Add HasConfigMap Scalatest trait

seldridge · seldridge · commit ef325d3305b7 · 2025-03-06T11:36:54.000-05:00
diff --git a/src/main/scala/chisel3/testing/scalatest/HasConfigMap.scala b/src/main/scala/chisel3/testing/scalatest/HasConfigMap.scala
@@ -42,7 +42,11 @@ trait HasConfigMap extends TestSuiteMixin { self: TestSuite =>
     *
     * This is only valid during a test.  It will be `None` if used outside a
     * test.
+    *
+    * @throws RuntimeException if called outside a Scalatest test
     */
-  def configMap: Option[ConfigMap] = _configMap.value
+  def configMap: ConfigMap = _configMap.value.getOrElse {
+    throw new RuntimeException("configMap may only be accessed inside a Scalatest test")
+  }
 
 }
diff --git a/src/test/scala-2/chiselTests/testing/scalatest/HasConfigMapSpec.scala b/src/test/scala-2/chiselTests/testing/scalatest/HasConfigMapSpec.scala
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package chiselTests.testing.scalatest
+
+import chisel3.testing.scalatest.HasConfigMap
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+class HasConfigMapSpec extends AnyFlatSpec with Matchers with HasConfigMap {
+
+  behavior of "HasConfigMap"
+
+  it should "be accessible inside a test" in {
+    configMap
+  }
+
+  val outsideTestException = intercept[Exception] {
+    configMap
+  }
+
+  it should "throw a RuntimeException if used outside a test" in {
+    outsideTestException shouldBe a[RuntimeException]
+    outsideTestException.getMessage should include("configMap may only be accessed inside a Scalatest test")
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ trait HasConfigMap extends TestSuiteMixin { self: TestSuite =>`
`42`	`42`	`*`
`43`	`43`	* This is only valid during a test. It will be `None` if used outside a
`44`	`44`	`* test.`
	`45`	`+ *`
	`46`	`+ * @throws RuntimeException if called outside a Scalatest test`
`45`	`47`	`*/`
`46`		`- def configMap: Option[ConfigMap] = _configMap.value`
	`48`	`+ def configMap: ConfigMap = _configMap.value.getOrElse {`
	`49`	`+ throw new RuntimeException("configMap may only be accessed inside a Scalatest test")`
	`50`	`+ }`
`47`	`51`
`48`	`52`	`}`