tracks/scala/testgen/src/main/scala/DominoesTestGenerator.scala in trackler-2.2.1.107 vs tracks/scala/testgen/src/main/scala/DominoesTestGenerator.scala in trackler-2.2.1.108
- old
+ new
@@ -15,34 +15,34 @@
case Right(false) => "false"
case Right(true) => "true"
}
}
- def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
- argNames map (name => toArgString(parseResult(name))) mkString ", "
+ def sutArgsFromInput(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
+ argNames map (name => toArgString(parseResult("input").asInstanceOf[Map[String, Any]](name))) mkString(", ")
+
def toArgString(any: Any): String = {
any match {
case xs: List[List[_]] => s"List(${xs.map(ys => s"(${ys.mkString(", ")})").mkString(", ")})"
case _ => any.toString
}
}
- def fromLabeledTest(argNames: String*): ToTestCaseData =
+ def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
withLabeledTest { sut =>
labeledTest =>
- val args = sutArgs(labeledTest.result, argNames: _*)
- val property = labeledTest.property
+ val args = sutArgsFromInput(labeledTest.result, argNames: _*)
val expected = toString(labeledTest.expected)
val sutCall =
s"""check($args, $expected)"""
TestCaseData(labeledTest.description, sutCall, expected)
}
val template: TestSuiteTemplate =
txt.funSuiteTemplateIgnoreExpected.asInstanceOf[Template1[TestSuiteData, Txt]]
- val code = TestSuiteBuilder.build(file, fromLabeledTest("input"), Seq(),
+ val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("dominoes"), Seq(),
Seq("private def check(input: List[(Int, Int)], hasResult: Boolean): Unit = {",
" val result = Dominoes.chain(input)", " if (hasResult) {",
" checkChain(result getOrElse fail(\"should have had a chain, but didn't\"), input)",
" }", " else assert(result == None)", " }",
"",