trackler 2.2.1.106 → 2.2.1.107

data/tracks/scala/exercises/difference-of-squares/src/test/scala/DifferenceOfSquaresTest.scala

@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.1.0 */
+/** @version 1.2.0 */
 class DifferenceOfSquaresTest extends FunSuite with Matchers {
 
   test("square of sum 1") {

data/tracks/scala/testgen/src/main/scala/BracketPushTestGenerator.scala

@@ -7,7 +7,7 @@ object BracketPushTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/bracket-push.json")
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("value"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/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)

data/tracks/scala/testgen/src/main/scala/CollatzConjectureTestGenerator.scala

@@ -15,10 +15,10 @@ object CollatzConjectureTestGenerator {
       }
     }
 
-    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)"""
@@ -26,7 +26,7 @@ object CollatzConjectureTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("number"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("number"))
 
     println(s"-------------")
     println(code)

data/tracks/scala/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,10 +28,10 @@ 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"""
@@ -39,7 +39,7 @@ object ConnectTestGenerator {
           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] =",

data/tracks/scala/testgen/src/main/scala/CryptoSquareTestGenerator.scala

@@ -8,7 +8,7 @@ object CryptoSquareTestGenerator {
     val file = new File("src/main/resources/crypto-square.json")
 
     val code = TestSuiteBuilder.build(file,
-        fromLabeledTestAlt("normalizedPlaintext" -> Seq("plaintext"), "plaintextSegments" -> Seq("plaintext"),
+        fromLabeledTestAltFromInput("normalizedPlaintext" -> Seq("plaintext"), "plaintextSegments" -> Seq("plaintext"),
           "encoded" -> Seq("plaintext"), "ciphertext" -> Seq("plaintext")))
     println(s"-------------")
     println(code)

data/tracks/scala/testgen/src/main/scala/CustomSetTestGenerator.scala

@@ -4,6 +4,9 @@ import scala.io.Source
 
 // Generates test suite from json test definition for the CustomSet exercise.
 class CustomSetTestGenerator {
+  implicit val singleSetInputReader = Json.reads[SingleSetInput]
+  implicit val doubleSetInputReader = Json.reads[DoubleSetInput]
+  implicit val setWithElementInputReader = Json.reads[SetWithElementInput]
   implicit val emptyTestCaseReader = Json.reads[EmptyTestCase]
   implicit val containsTestCasesReader = Json.reads[ContainsTestCase]
   implicit val subsetTestCasesReader = Json.reads[SubsetTestCase]
@@ -44,7 +47,7 @@ class CustomSetTestGenerator {
     val emptyTestCases = (json \ "cases" \ 0 \ "cases").get.as[List[EmptyTestCase]]
 
     implicit def testCaseToGen(tc: EmptyTestCase): TestCaseGen = {
-      val set = s"CustomSet.fromList(${tc.set})"
+      val set = s"CustomSet.fromList(${tc.input.set})"
       val callSUT = s"CustomSet.empty(set)"
       val expected = tc.expected.toString
       val result = s"val set = $set"
@@ -63,8 +66,8 @@ class CustomSetTestGenerator {
     val containsTestCases = (json \ "cases" \ 1 \ "cases").get.as[List[ContainsTestCase]]
 
     implicit def testCaseToGen(tc: ContainsTestCase): TestCaseGen = {
-      val set = s"CustomSet.fromList(${tc.set})"
-      val callSUT = s"CustomSet.member(set, ${tc.element})"
+      val set = s"CustomSet.fromList(${tc.input.set})"
+      val callSUT = s"CustomSet.member(set, ${tc.input.element})"
       val expected = tc.expected.toString
       val result = s"val set = $set"
       val checkResult = s"$callSUT should be ($expected)"
@@ -82,8 +85,8 @@ class CustomSetTestGenerator {
     val subsetTestCases = (json \ "cases" \ 2 \ "cases").get.as[List[SubsetTestCase]]
 
     implicit def testCaseToGen(tc: SubsetTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.isSubsetOf(set1, set2)"
       val expected = tc.expected.toString
       val result =
@@ -104,8 +107,8 @@ s"""val set1 = $set1
     val disjointTestCases = (json \ "cases" \ 3 \ "cases").get.as[List[DisjointTestCase]]
 
     implicit def testCaseToGen(tc: DisjointTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.isDisjointFrom(set1, set2)"
       val expected = tc.expected.toString
       val result =
@@ -126,8 +129,8 @@ s"""val set1 = $set1
     val equalTestCases = (json \ "cases" \ 4 \ "cases").get.as[List[EqualTestCase]]
 
     implicit def testCaseToGen(tc: EqualTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.isEqual(set1, set2)"
       val expected = tc.expected.toString
       val result =
@@ -148,8 +151,8 @@ s"""val set1 = $set1
     val addTestCases = (json \ "cases" \ 5 \ "cases").get.as[List[AddTestCase]]
 
     implicit def testCaseToGen(tc: AddTestCase): TestCaseGen = {
-      val set = s"CustomSet.fromList(${tc.set})"
-      val callSUT = s"CustomSet.insert(set, ${tc.element})"
+      val set = s"CustomSet.fromList(${tc.input.set})"
+      val callSUT = s"CustomSet.insert(set, ${tc.input.element})"
       val expected = s"CustomSet.fromList(${tc.expected})"
       val result =
 s"""val set = $set
@@ -169,8 +172,8 @@ s"""val set = $set
     val intersectionTestCases = (json \ "cases" \ 6 \ "cases").get.as[List[IntersectionTestCase]]
 
     implicit def testCaseToGen(tc: IntersectionTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.intersection(set1, set2)"
       val expected = s"CustomSet.fromList(${tc.expected})"
       val result =
@@ -192,8 +195,8 @@ s"""val set1 = $set1
     val differenceTestCases = (json \ "cases" \ 7 \ "cases").get.as[List[DifferenceTestCase]]
 
     implicit def testCaseToGen(tc: DifferenceTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.difference(set1, set2)"
       val expected = s"CustomSet.fromList(${tc.expected})"
       val result =
@@ -215,8 +218,8 @@ s"""val set1 = $set1
     val unionTestCases = (json \ "cases" \ 8 \ "cases").get.as[List[UnionTestCase]]
 
     implicit def testCaseToGen(tc: UnionTestCase): TestCaseGen = {
-      val set1 = s"CustomSet.fromList(${tc.set1})"
-      val set2 = s"CustomSet.fromList(${tc.set2})"
+      val set1 = s"CustomSet.fromList(${tc.input.set1})"
+      val set2 = s"CustomSet.fromList(${tc.input.set2})"
       val callSUT = s"CustomSet.union(set1, set2)"
       val expected = s"CustomSet.fromList(${tc.expected})"
       val result =
@@ -233,15 +236,18 @@ s"""val set1 = $set1
 
 }
 
-case class EmptyTestCase(description: String, set: List[Int], expected: Boolean)
-case class ContainsTestCase(description: String, set: List[Int], element: Int, expected: Boolean)
-case class SubsetTestCase(description: String, set1: List[Int], set2: List[Int], expected: Boolean)
-case class DisjointTestCase(description: String, set1: List[Int], set2: List[Int], expected: Boolean)
-case class EqualTestCase(description: String, set1: List[Int], set2: List[Int], expected: Boolean)
-case class AddTestCase(description: String, set: List[Int], element: Int, expected: List[Int])
-case class IntersectionTestCase(description: String, set1: List[Int], set2: List[Int], expected: List[Int])
-case class DifferenceTestCase(description: String, set1: List[Int], set2: List[Int], expected: List[Int])
-case class UnionTestCase(description: String, set1: List[Int], set2: List[Int], expected: List[Int])
+case class SingleSetInput(set: List[Int])
+case class DoubleSetInput(set1: List[Int], set2: List[Int])
+case class SetWithElementInput(set: List[Int], element: Int)
+case class EmptyTestCase(description: String, input: SingleSetInput, expected: Boolean)
+case class ContainsTestCase(description: String, input: SetWithElementInput, expected: Boolean)
+case class SubsetTestCase(description: String, input: DoubleSetInput, expected: Boolean)
+case class DisjointTestCase(description: String, input: DoubleSetInput, expected: Boolean)
+case class EqualTestCase(description: String, input: DoubleSetInput, expected: Boolean)
+case class AddTestCase(description: String, input: SetWithElementInput, expected: List[Int])
+case class IntersectionTestCase(description: String, input: DoubleSetInput, expected: List[Int])
+case class DifferenceTestCase(description: String, input: DoubleSetInput, expected: List[Int])
+case class UnionTestCase(description: String, input: DoubleSetInput, expected: List[Int])
 
 
 object CustomSetTestGenerator {

data/tracks/scala/testgen/src/main/scala/DifferenceOfSquaresTestGenerator.scala

@@ -8,7 +8,7 @@ object DifferenceOfSquaresTestGenerator {
     val file = new File("src/main/resources/difference-of-squares.json")
 
     val code = TestSuiteBuilder.build(file,
-        fromLabeledTestAlt("squareOfSum" -> Seq("number"), "sumOfSquares" -> Seq("number"),
+        fromLabeledTestAltFromInput("squareOfSum" -> Seq("number"), "sumOfSquares" -> Seq("number"),
           "differenceOfSquares" -> Seq("number")))
     println(s"-------------")
     println(code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.106
+  version: 2.2.1.107
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -4398,7 +4398,6 @@ files:
 - tracks/elm/config/exercise_readme.go.tmpl
 - tracks/elm/config/maintainers.json
 - tracks/elm/docs/ABOUT.md
-- tracks/elm/docs/EXERCISE_README_INSERT.md
 - tracks/elm/docs/INSTALLATION.md
 - tracks/elm/docs/LEARNING.md
 - tracks/elm/docs/RESOURCES.md
@@ -6198,6 +6197,12 @@ files:
 - tracks/go/exercises/protein-translation/README.md
 - tracks/go/exercises/protein-translation/example.go
 - tracks/go/exercises/protein-translation/protein_translation_test.go
+- tracks/go/exercises/proverb/.meta/gen.go
+- tracks/go/exercises/proverb/README.md
+- tracks/go/exercises/proverb/cases_test.go
+- tracks/go/exercises/proverb/example.go
+- tracks/go/exercises/proverb/proverb.go
+- tracks/go/exercises/proverb/proverb_test.go
 - tracks/go/exercises/pythagorean-triplet/README.md
 - tracks/go/exercises/pythagorean-triplet/example.go
 - tracks/go/exercises/pythagorean-triplet/pythagorean_triplet_test.go

data/tracks/elm/docs/EXERCISE_README_INSERT.md

@@ -1,28 +0,0 @@
-## Elm Installation
-
-Refer to the [Exercism help page](http://exercism.io/languages/elm) for Elm
-installation and learning resources.
-
-## Writing the Code
-
-The first time you start an exercise, you'll need to ensure you have the
-appropriate dependencies installed.
-
-```bash
-$ npm install
-```
-
-Execute the tests with:
-
-```bash
-$ npm test
-```
-
-Automatically run tests again when you save changes:
-
-```bash
-$ npm run watch
-```
-
-As you work your way through the test suite, be sure to remove the `skip <|`
-calls from each test until you get them all passing!