From 8305516ec86d70db50735eccc3d524ab0fbb0258 Mon Sep 17 00:00:00 2001 From: Ric Emery Date: Sat, 17 Feb 2018 09:55:31 -0700 Subject: [PATCH] Update change to match latest canonical json. Refs #488 --- exercises/change/src/test/scala/ChangeTest.scala | 4 ++-- testgen/src/main/scala/ChangeTestGenerator.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exercises/change/src/test/scala/ChangeTest.scala b/exercises/change/src/test/scala/ChangeTest.scala index 4ecb4c34..bac9aa5f 100644 --- a/exercises/change/src/test/scala/ChangeTest.scala +++ b/exercises/change/src/test/scala/ChangeTest.scala @@ -1,8 +1,8 @@ import org.scalatest.{Matchers, FunSuite} -/** @version 1.1.0 */ +/** @version 1.2.0 */ class ChangeTest extends FunSuite with Matchers { - + test("single coin change") { Change.findFewestCoins(25, List(1, 5, 10, 25, 100)) should be (Some(List(25))) } diff --git a/testgen/src/main/scala/ChangeTestGenerator.scala b/testgen/src/main/scala/ChangeTestGenerator.scala index 93e3e8b4..eb253c60 100644 --- a/testgen/src/main/scala/ChangeTestGenerator.scala +++ b/testgen/src/main/scala/ChangeTestGenerator.scala @@ -15,10 +15,10 @@ object ChangeTestGenerator { } } - 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.$property($args)""" @@ -28,7 +28,7 @@ object ChangeTestGenerator { val code = TestSuiteBuilder.build(file, - fromLabeledTest("target", "coins")) + fromLabeledTestFromInput("target", "coins")) println(s"-------------") println(code)