trackler 2.2.1.107 → 2.2.1.108

data/tracks/scala/exercises/leap/src/test/scala/LeapTest.scala

@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.3.0 */
 class LeapTest extends FunSuite with Matchers {
 
   test("year not divisible by 4: common year") {
@@ -9,7 +9,7 @@ class LeapTest extends FunSuite with Matchers {
 
   test("year divisible by 4, not divisible by 100: leap year") {
     pending
-    Leap.leapYear(2016) should be (true)
+    Leap.leapYear(1996) should be (true)
   }
 
   test("year divisible by 100, not divisible by 400: common year") {
@@ -21,4 +21,4 @@ class LeapTest extends FunSuite with Matchers {
     pending
     Leap.leapYear(2000) should be (true)
   }
-}
+}

data/tracks/scala/exercises/luhn/src/test/scala/LuhnTest.scala

@@ -1,13 +1,13 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.1.0 */
 class LuhnTest extends FunSuite with Matchers {
 
   test("single digit strings can not be valid") {
     Luhn.valid("1") should be (false)
   }
 
-  test("A single zero is invalid") {
+  test("a single zero is invalid") {
     pending
     Luhn.valid("0") should be (false)
   }
@@ -66,4 +66,4 @@ class LuhnTest extends FunSuite with Matchers {
     pending
     Luhn.valid("091") should be (true)
   }
-}
+}

data/tracks/scala/exercises/matrix/example.scala

@@ -1,5 +1,9 @@
 case class Matrix(matrix: String) {
   lazy val rows: Vector[Vector[Int]] = matrix.lines.map(_.split(' ').map(_.toInt).toVector).toVector
 
-  lazy val cols: Vector[Vector[Int]] = rows.transpose
+  lazy val columns: Vector[Vector[Int]] = rows.transpose
+
+  def row(i: Int) = rows(i)
+
+  def column(i: Int) = columns(i)
 }

data/tracks/scala/exercises/matrix/src/test/scala/MatrixTest.scala

@@ -1,21 +1,57 @@
-import org.scalatest.{Matchers, FlatSpec}
+import org.scalatest.{Matchers, FunSuite}
 
-/** @version created manually **/
-class MatrixTest extends FlatSpec with Matchers {
-  it should "extract a row" in {
-    Matrix("1 2\n10 20").rows(0) should be (Vector(1, 2))
-    Matrix("1 2\n10 20\n100 200").rows(2) should be (Vector(100, 200))
+/** @version 1.0.0 */
+class MatrixTest extends FunSuite with Matchers {
+
+  test("extract row from one number matrix") {
+    Matrix("1").row(0) should be(Vector(1))
+  }
+
+  test("can extract row") {
+    pending
+    Matrix("1 2\n" +
+           "3 4").row(1) should be(Vector(3, 4))
+  }
+
+  test("extract row where numbers have different widths") {
+    pending
+    Matrix("1 2\n" +
+           "10 20").row(1) should be(Vector(10, 20))
+  }
+
+  test("can extract row from non-square matrix") {
+    pending
+    Matrix("1 2 3\n"
+         + "4 5 6\n"
+         + "7 8 9\n"
+         + "8 7 6").row(2) should be(
+      Vector(7, 8, 9))
+  }
+
+  test("extract column from one number matrix") {
+    pending
+    Matrix("1").column(0) should be(Vector(1))
+  }
+
+  test("can extract column") {
+    pending
+    Matrix("1 2 3\n"
+         + "4 5 6\n"
+         + "7 8 9").column(2) should be(Vector(3, 6, 9))
   }
 
-  it should "extract a col" in {
+  test("can extract column from non-square matrix") {
     pending
-    Matrix("1 2\n10 20").cols(0) should be (Vector(1, 10))
-    Matrix("1 2\n10 20\n100 200").cols(1) should be (Vector(2, 20, 200))
+    Matrix("1 2 3\n"
+         + "4 5 6\n"
+         + "7 8 9\n"
+         + "8 7 6").column(2) should be(Vector(3, 6, 9, 6))
   }
 
-  it should "support equality" in {
+  test("extract column where numbers have different widths") {
     pending
-    Matrix("1 2\n10 20") should be (Matrix("1 2\n10 20"))
-    Matrix("1 2\n10 20") should not be Matrix("20 10\n100 200")
+    Matrix("89 1903 3\n"
+         + "18 3 1\n"
+         + "9 4 800").column(1) should be(Vector(1903, 3, 4))
   }
 }

data/tracks/scala/exercises/meetup/src/test/scala/MeetupTest.scala

@@ -1,7 +1,8 @@
 import java.time.LocalDate
+
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.1.0 */
 class MeetupTest extends FunSuite with Matchers {
 
   test("monteenth of May 2013") {

data/tracks/scala/exercises/minesweeper/src/test/scala/MinesweeperTest.scala

@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 1.1.0 */
 class MinesweeperTest extends FunSuite with Matchers {
 
   test("no rows") {
@@ -22,7 +22,7 @@ class MinesweeperTest extends FunSuite with Matchers {
            "   "))
   }
 
-  test("board with only mines") {
+  test("minefield with only mines") {
     pending
     Minesweeper.annotate(List("***",
                               "***",
@@ -104,7 +104,7 @@ class MinesweeperTest extends FunSuite with Matchers {
            " 2*2 "))
   }
 
-  test("large board") {
+  test("large minefield") {
     pending
     Minesweeper.annotate(List(" *  * ",
                               "  *   ",
@@ -112,11 +112,11 @@ class MinesweeperTest extends FunSuite with Matchers {
                               "   * *",
                               " *  * ",
                               "      ")) should be(
-      List("1*22*1", 
-           "12*322", 
-           " 123*2", 
-           "112*4*", 
-           "1*22*2", 
-          "111111"))
+      List("1*22*1",
+           "12*322",
+           " 123*2",
+           "112*4*",
+           "1*22*2",
+           "111111"))
   }
 }

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

@@ -17,8 +17,9 @@ object DominoesTestGenerator {
       }
     }
 
-    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 {
@@ -27,11 +28,10 @@ object DominoesTestGenerator {
       }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
-          val property = labeledTest.property
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val expected = toString(labeledTest.expected)
           val sutCall =
             s"""check($args, $expected)"""
@@ -41,7 +41,7 @@ object DominoesTestGenerator {
     val template: TestSuiteTemplate =
       txt.funSuiteTemplateIgnoreExpected.asInstanceOf[Template1[TestSuiteData, Txt]]
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"), Seq(),
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("dominoes"), Seq(),
       Seq("private def check(input: List[(Int, Int)], hasResult: Boolean): Unit = {",
         "    val result = Dominoes.chain(input)", "    if (hasResult) {",
         "      checkChain(result getOrElse fail(\"should have had a chain, but didn't\"), input)",

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

@@ -1,14 +1,14 @@
 import java.io.File
 
-import testgen.TestSuiteBuilder._
+import testgen.TestSuiteBuilder.{toString, _}
 import testgen._
 
 object FlattenArrayTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/flatten-array.json")
 
-    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 {
@@ -25,10 +25,10 @@ object FlattenArrayTestGenerator {
       }
     }
 
-    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)"""
@@ -36,7 +36,7 @@ object FlattenArrayTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("array"))
     println(s"-------------")
     println(code)
     println(s"-------------")

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

@@ -3,16 +3,14 @@ import TestSuiteBuilder.{toString, _}
 import java.io.File
 
 object FoodChainTestGenerator {
-  def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String = {
-    val firstParam = parseResult.get("start verse") match {
-      case Some(s) => s.toString
-      case _ => throw new IllegalArgumentException("Missing start verse")
-    }
-    val secondParam = parseResult.get("end verse")
-
-    firstParam + secondParam.map(s => ", " + s.toString).getOrElse("")
-  }
+  def sutArgsFromInput(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String = {
+    val input = parseResult("input").asInstanceOf[Map[String, Int]]
+
+    val firstParam = input("startVerse").toString
+    val secondParam = input("endVerse").toString
 
+    firstParam + ", " + secondParam
+  }
 
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/food-chain.json")
@@ -20,12 +18,12 @@ object FoodChainTestGenerator {
     val RawQuote = "\"\"\""
     def asRawString(str: String): String = s"$RawQuote$str$RawQuote"
 
-    def fromLabeledTest(argNames: String*)(
+    def fromLabeledTestFromInput(argNames: String*)(
       implicit sutFunction: LabeledTest => String = _.property): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
           val sutFunction = labeledTest.property
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val sutCall = s"$sut.$sutFunction(${args})"
           val expectedLines = labeledTest.expected.right.get.asInstanceOf[List[String]]
           val expected = expectedLines mkString ("", "\n", "\n\n")
@@ -34,7 +32,7 @@ object FoodChainTestGenerator {
       }
 
     val code = TestSuiteBuilder.build(file,
-      fromLabeledTest("start verse", "end verse"))
+      fromLabeledTestFromInput("startVerse", "endVerse"))
     println(s"-------------")
     println(code)
     println(s"-------------")

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

@@ -34,14 +34,13 @@ object ForthTestGenerator {
       }
     }
 
-    def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
-      argNames map (name => argsToString(parseResult(name))) mkString ", "
+    def sutArgsFromInput(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
+      argNames map (name => argsToString(parseResult("input").asInstanceOf[Map[String, Any]](name))) mkString ", "
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
-          val property = labeledTest.property
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val isErr = isError(labeledTest.expected)
           val sutCall = if (isErr)
               s"""forth.eval($args).isLeft"""
@@ -57,7 +56,8 @@ object ForthTestGenerator {
       }
 
     val code =
-      TestSuiteBuilder.build(file, fromLabeledTest("input"), Seq(), Seq("private val forth = new Forth"))
+      TestSuiteBuilder.build(file, fromLabeledTestFromInput("instructions"),
+        Seq(), Seq("private val forth = new Forth"))
 
     println(s"-------------")
     println(code)

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

@@ -15,14 +15,16 @@ object GigasecondTestGenerator {
       }
     }
 
-    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 expected = toString(labeledTest.expected)
 
-          val useDateTime = labeledTest.result("input").asInstanceOf[String].length > "xxxx-xx-xx".length
+          val useDateTime = labeledTest.result("input")
+            .asInstanceOf[Map[String, Any]]("birthdate")
+            .asInstanceOf[String].length > "xxxx-xx-xx".length
           val sutCall = if (useDateTime) {
             s"""val input = dateTime($args)
     val expected = dateTime($expected)
@@ -39,7 +41,7 @@ object GigasecondTestGenerator {
 
     val dateTimeFn = "private def dateTime(str: String): LocalDateTime =\n    LocalDateTime.from(DateTimeFormatter.ISO_DATE_TIME.parse(str))"
     val dateFn = "private def date(str: String): LocalDate =\n    LocalDate.from(DateTimeFormatter.ISO_DATE.parse(str))"
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"),
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("birthdate"),
       Seq("java.time.LocalDate", "java.time.LocalDateTime", "java.time.format.DateTimeFormatter"),
       Seq(dateTimeFn, dateFn))
     println(s"-------------")

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

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

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

@@ -4,20 +4,14 @@ import testgen.TestSuiteBuilder._
 import testgen._
 
 object HouseTestGenerator {
-  def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String = {
-    val startVerse = parseResult.get("start verse")
-    val endVerse = parseResult.get("end verse")
-    val verse = parseResult.get("verse")
-
-    startVerse match {
-      case Some(s) => s.toString + endVerse.map(s => ", " + s.toString).getOrElse("")
-      case _ => verse match {
-        case Some(s) => s.toString
-        case _ => throw new IllegalStateException("Missing params")
-      }
-    }
-  }
+  def sutArgsFromInput(parseResult: CanonicalDataParser.ParseResult): String = {
+    val input = parseResult("input").asInstanceOf[Map[String, Int]]
 
+    val firstParam = input("startVerse").toString
+    val secondParam = input("endVerse").toString
+
+    firstParam + ", " + secondParam
+  }
 
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/house.json")
@@ -25,12 +19,12 @@ object HouseTestGenerator {
     val RawQuote = "\"\"\""
     def asRawString(str: String): String = s"$RawQuote$str$RawQuote"
 
-    def fromLabeledTest(argNames: String*)(
+    def fromLabeledTestFromInput(argNames: String*)(
       implicit sutFunction: LabeledTest => String = _.property): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
           val sutFunction = labeledTest.property
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result)
           val sutCall = s"$sut.$sutFunction($args)"
           val expectedLines = labeledTest.expected.right.get.asInstanceOf[List[String]]
           val expected = expectedLines mkString ("", "\n", "\n\n")
@@ -39,7 +33,7 @@ object HouseTestGenerator {
       }
 
     val code = TestSuiteBuilder.build(file,
-      fromLabeledTest("verse", "start verse", "end verse"))
+      fromLabeledTestFromInput())
     println(s"-------------")
     println(code)
     println(s"-------------")

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

@@ -8,7 +8,7 @@ object IsogramTestGenerator {
     val file = new File("src/main/resources/isogram.json")
 
     val code = TestSuiteBuilder.build(file,
-      fromLabeledTest("input"))
+      fromLabeledTestFromInput("phrase"))
     println(s"-------------")
     println(code)
     println(s"-------------")