Update connect exercise to match latest canonical json.

Refs exercism#488
ricemery · Feb 17, 2018 · f1ff758 · f1ff758
1 parent 56479ec
commit f1ff758
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/exercises/connect/src/test/scala/ConnectTest.scala b/exercises/connect/src/test/scala/ConnectTest.scala
@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.1.0 */
 class ConnectTest extends FunSuite with Matchers {
 
   // Filter readable board into valid input

diff --git a/testgen/src/main/scala/ConnectTestGenerator.scala b/testgen/src/main/scala/ConnectTestGenerator.scala
@@ -1,6 +1,6 @@
 import java.io.File
 
-import testgen.TestSuiteBuilder._
+import testgen.TestSuiteBuilder.{toString, _}
 import testgen._
 
 object ConnectTestGenerator {
@@ -16,8 +16,8 @@ object ConnectTestGenerator {
       }
     }
 
-    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 {
@@ -28,18 +28,18 @@ object ConnectTestGenerator {
       }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val property = labeledTest.property
           val sutCall =
             s"""$sut($args).$property"""
           val expected = toString(labeledTest.expected)
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("board"),
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("board"),
       Seq(),
       Seq("// Filter readable board into valid input",
           "private def mkBoard(lines: List[String]): List[String] =",