diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala | 54 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/ParserSpec.scala | 3 | ||||
| -rw-r--r-- | src/test/scala/loggertests/LoggerSpec.scala | 20 |
3 files changed, 2 insertions, 75 deletions
diff --git a/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala b/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala deleted file mode 100644 index f176fe38..00000000 --- a/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 - -package firrtlTests - -import firrtl._ -import org.scalatest.freespec.AnyFreeSpec -import org.scalatest.matchers.should.Matchers - -class ExecutionOptionsManagerSpec extends AnyFreeSpec with Matchers { - "ExecutionOptionsManager is a container for one more more ComposableOptions Block" - { - "It has a default CommonOptionsBlock" in { - val manager = new ExecutionOptionsManager("test") - manager.topName should be("") - manager.targetDirName should be(".") - manager.commonOptions.topName should be("") - manager.commonOptions.targetDirName should be(".") - } - "But can override defaults like this" in { - val manager = new ExecutionOptionsManager("test") { - commonOptions = CommonOptions(topName = "dog", targetDirName = "a/b/c") - } - manager.commonOptions shouldBe a[CommonOptions] - manager.topName should be("dog") - manager.targetDirName should be("a/b/c") - manager.commonOptions.topName should be("dog") - manager.commonOptions.targetDirName should be("a/b/c") - } - "The add method should put a new version of a given type the manager" in { - val manager = new ExecutionOptionsManager("test") { - commonOptions = CommonOptions(topName = "dog", targetDirName = "a/b/c") - } - val initialCommon = manager.commonOptions - initialCommon.topName should be("dog") - initialCommon.targetDirName should be("a/b/c") - - manager.commonOptions = CommonOptions(topName = "cat", targetDirName = "d/e/f") - - val afterCommon = manager.commonOptions - afterCommon.topName should be("cat") - afterCommon.targetDirName should be("d/e/f") - initialCommon.topName should be("dog") - initialCommon.targetDirName should be("a/b/c") - } - "multiple composable blocks should be separable" in { - val manager = new ExecutionOptionsManager("test") with HasFirrtlOptions { - commonOptions = CommonOptions(topName = "spoon") - firrtlOptions = FirrtlExecutionOptions(inputFileNameOverride = "fork") - } - - manager.firrtlOptions.inputFileNameOverride should be("fork") - manager.commonOptions.topName should be("spoon") - } - } -} diff --git a/src/test/scala/firrtlTests/ParserSpec.scala b/src/test/scala/firrtlTests/ParserSpec.scala index 57b468ea..89e73cb7 100644 --- a/src/test/scala/firrtlTests/ParserSpec.scala +++ b/src/test/scala/firrtlTests/ParserSpec.scala @@ -312,9 +312,6 @@ class ParserSpec extends FirrtlFlatSpec { | bar.a <- a | b <- bar.b """.stripMargin - val manager = new ExecutionOptionsManager("test") with HasFirrtlOptions { - firrtlOptions = FirrtlExecutionOptions(firrtlSource = Some(input)) - } a[SyntaxErrorsException] shouldBe thrownBy { (new FirrtlStage).execute(Array(), Seq(FirrtlSourceAnnotation(input))) } diff --git a/src/test/scala/loggertests/LoggerSpec.scala b/src/test/scala/loggertests/LoggerSpec.scala index d9feb931..e0a7b43d 100644 --- a/src/test/scala/loggertests/LoggerSpec.scala +++ b/src/test/scala/loggertests/LoggerSpec.scala @@ -41,7 +41,7 @@ class LoggerSpec extends AnyFreeSpec with Matchers with OneInstancePerTest with "Logger is a simple but powerful logging system" - { "Following tests show how global level can control logging" - { - "setting level to None will result in only error messages" in { + "setting level to None will result in warn messages" in { Logger.makeScope() { val captor = new OutputCaptor Logger.setOutput(captor.printStream) @@ -52,7 +52,7 @@ class LoggerSpec extends AnyFreeSpec with Matchers with OneInstancePerTest with val messagesLogged = captor.getOutputAsString messagesLogged.contains(LoggerSpec.ErrorMsg) should be(true) - messagesLogged.contains(LoggerSpec.WarnMsg) should be(false) + messagesLogged.contains(LoggerSpec.WarnMsg) should be(true) messagesLogged.contains(LoggerSpec.InfoMsg) should be(false) messagesLogged.contains(LoggerSpec.DebugMsg) should be(false) messagesLogged.contains(LoggerSpec.TraceMsg) should be(false) @@ -274,22 +274,6 @@ class LoggerSpec extends AnyFreeSpec with Matchers with OneInstancePerTest with messagesLogged.contains("logger3") should be(true) } } - "Show logging can be set with command options" in { - val captor = new Logger.OutputCaptor - - Logger.makeScope(Array("--class-log-level", "loggertests.LogsInfo3:info")) { - Logger.setOutput(captor.printStream) - val r2 = new LogsInfo2 - val r3 = new LogsInfo3 - r2.run() - r3.run() - - val messagesLogged = captor.getOutputAsString - - messagesLogged.contains("logger2") should be(false) - messagesLogged.contains("logger3") should be(true) - } - } "Show that printstream remains across makeScopes" in { Logger.makeScope() { val captor = new Logger.OutputCaptor |