Merge pull request exercism#492 from ricemery/allergies

Update allergies test generator to match latest canonical json.
ricemery · Feb 9, 2018 · de0d974 · de0d974
2 parents ec99f29 + e5ea36a
commit de0d974
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/exercises/allergies/src/test/scala/AllergiesTest.scala b/exercises/allergies/src/test/scala/AllergiesTest.scala
@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.1.0 */
 class AllergiesTest extends FunSuite with Matchers {
 
   test("Allergen.Peanuts - no allergies means not allergic") {

diff --git a/testgen/src/main/scala/AllergiesTestGenerator.scala b/testgen/src/main/scala/AllergiesTestGenerator.scala
@@ -1,6 +1,6 @@
 import java.io.File
 
-import testgen.TestSuiteBuilder._
+import testgen.TestSuiteBuilder.{fromLabeledTestFromInput, _}
 import testgen._
 
 object AllergiesTestGenerator {
@@ -30,10 +30,13 @@ object AllergiesTestGenerator {
     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)
@@ -44,15 +47,15 @@ object AllergiesTestGenerator {
               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"-------------")