tracks/scala/testgen/src/main/scala/AllergiesTestGenerator.scala in trackler-2.2.1.104 vs tracks/scala/testgen/src/main/scala/AllergiesTestGenerator.scala in trackler-2.2.1.105

- old
+ new

@@ -1,8 +1,8 @@ import java.io.File -import testgen.TestSuiteBuilder._ +import testgen.TestSuiteBuilder.{fromLabeledTestFromInput, _} import testgen._ object AllergiesTestGenerator { def main(args: Array[String]): Unit = { val file = new File("src/main/resources/allergies.json") @@ -28,32 +28,35 @@ } def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String = argNames map (name => TestSuiteBuilder.toString(parseResult(name))) mkString ", " - def fromLabeledTest(argNames: String*): ToTestCaseDataList = + def getScore(labeledTest: LabeledTest): Int = + labeledTest.result("input").asInstanceOf[Map[String, Any]]("score").asInstanceOf[Int] + + def fromLabeledTestFromInput(argNames: String*): ToTestCaseDataList = withLabeledList { sut => labeledTest => - val score = labeledTest.result("score").asInstanceOf[Int] + val score = getScore(labeledTest) val property = labeledTest.property if ("allergicTo".equals(property)) { val expected: List[(String, Boolean)] = toAllergicToExpected(labeledTest.expected) expected.map(e => { val sutCall = s"""$sut.$property(${e._1}, $score)""" val result = e._2.toString TestCaseData(s"${e._1} - ${labeledTest.description}", sutCall, result) }) } else { - val args = sutArgs(labeledTest.result, "score") + val args = sutArgsFromInput(labeledTest.result, "score") val expected = toListExpected(labeledTest.expected) val sutCall = s"""$sut.$property($args)""" List(TestCaseData(labeledTest.description, sutCall, expected)) } } - val code = TestSuiteBuilder.buildFromList(file, fromLabeledTest("score")) + val code = TestSuiteBuilder.buildFromList(file, fromLabeledTestFromInput("score")) println(s"-------------") println(code) println(s"-------------") } }