trackler 2.0.6.8 → 2.0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06eb068eafe08df34df6d6694c3addea1a148d25
-  data.tar.gz: 40fc285269f963be93d20e6aa3b6e88502f83713
+  metadata.gz: b14825c924ae155ef47cfae4208988fc6fe0792a
+  data.tar.gz: d95acda90518c0b892a492427df1449ada88ef61
 SHA512:
-  metadata.gz: bdc0498d9f33dea2d191d3b728f8f33fc0808f4cfc17413674440ef0a6352a7a6e50389df6c434a2e243b1a25e9e97f3eb5ed7ee74383079c55b9b5692cd7206
-  data.tar.gz: 720ef4ddced6739a38e22c33ff657e8ca0b14b019d4d7940a587b18b0ed7d22572d7010b83c7c72b43ca1a8b003ab0081a7ae88aa64059a892e2b60e143a5e77
+  metadata.gz: 6b246ba31cee380b84c8419cd4cc55ef0e52955888e5f1da274fff1956a71f9f5cb81e6f4625be50dc2d4a82d26650aee8372b2cde6377e3a149c083d681ae0d
+  data.tar.gz: 2248d24225e54c4ea418a19cdf51e68140f5993e92d869866a0553023b6623ab83f9a385b1a408910db48a21bf398ea4c76bae8cb3876909020b818deb91d84c

data/common/exercises/luhn/canonical-data.json

@@ -1,70 +1,34 @@
 {
-   "#": [
-     "The only note about this exercise is to make sure that the methods used",
-     "to check if a number is valid and to compute its checksum DO NOT modify",
-     "the value of the internal attributes.  ",
-     "I say this because I've seen for the Python testcases that it needs a last",
-     "test to call the validation method twice to assure this.  ",
-     "Simply assure that the two methods are const methods (to use a C++ notation)",
-     "using the tools available in your language.  ",
-     "Here is a pretty universal solution for the validation method:  ",
-     "`return (0 === (this.checksum % 10)) ? true : false;`"
-   ],
-   "cases": [
-      {
-         "description": "check digit",
-         "input": 34567,
-         "expected": 7
-      },
-      {
-         "description": "check digit with input ending in zero",
-         "input": 91370,
-         "expected": 0
-      },
-      {
-         "description": "check addends",
-         "input": 12121,
-         "expected": [1, 4, 1, 4, 1]
-      },
-      {
-         "description": "check too large addends",
-         "input": 8631,
-         "expected": [7, 6, 6, 1]
-      },
-      {
-         "description": "checksum",
-         "input": 4913,
-         "expected": 22
-      },
-      {
-         "description": "checksum of larger number",
-         "input": 201773,
-         "expected": 21
-      },
-      {
-         "description": "check invalid number",
-         "input": 738,
-         "expected": false
-      },
-      {
-         "description": "check valid number",
-         "input": 8739567,
-         "expected": true
-      },
-      {
-         "description": "create valid number",
-         "input": 123,
-         "expected": 1230
-      },
-      {
-         "description": "create larger valid number",
-         "input": 873956,
-         "expected": 8739567
-      },
-      {
-         "description": "create even larger valid number",
-         "input": 837263756,
-         "expected": 8372637564
-      }
-   ]
+  "valid": [
+    {
+      "description": "single digit strings can not be valid",
+      "input": "1",
+      "expected": false
+    },
+    {
+      "description": "A single zero is invalid",
+      "input": "0",
+      "expected": false
+    },
+    {
+      "description": "valid Canadian SIN",
+      "input": "046 454 286",
+      "expected": true
+    },
+    {
+      "description": "invalid Canadian SIN",
+      "input": "046 454 287",
+      "expected": false
+    },
+    {
+      "description": "invalid credit card",
+      "input": "8273 1232 7352 0569",
+      "expected": false
+    },
+    {
+      "description": "strings that contain non-digits are not valid",
+      "input": "827a 1232 7352 0569",
+      "expected": false
+    }
+  ]
 }

data/common/exercises/luhn/description.md

@@ -1,53 +1,80 @@
-The Luhn formula is a simple checksum formula used to validate a variety
-of identification numbers, such as credit card numbers and Canadian
-Social Insurance Numbers.
-
-The formula verifies a number against its included check digit, which is
-usually appended to a partial number to generate the full number. This
-number must pass the following test:
-
-- Counting from rightmost digit (which is the check digit) and moving
-  left, double the value of every second digit.
-- For any digits that thus become 10 or more, subtract 9 from the
-  result.
-  - 1111 becomes 2121.
-  - 8763 becomes 7733 (from 2×6=12 → 12-9=3 and 2×8=16 → 16-9=7).
-- Add all these digits together.
-  - 1111 becomes 2121 sums as 2+1+2+1 to give a check digit of 6.
-  - 8763 becomes 7733, and 7+7+3+3 is 20.
-
-If the total ends in 0 (put another way, if the total modulus 10 is
-congruent to 0), then the number is valid according to the Luhn formula;
-else it is not valid. So, 1111 is not valid (as shown above, it comes
-out to 6), while 8763 is valid (as shown above, it comes out to 20).
-
-Write a program that, given a number
-
-- Can check if it is valid per the Luhn formula. This should treat, for
-  example, "2323 2005 7766 3554" as valid.
-- Can return the checksum, or the remainder from using the Luhn method.
-- Can add a check digit to make the number valid per the Luhn formula and
-  return the original number plus that digit. This should give "2323 2005 7766
-  3554" in response to "2323 2005 7766 355".
-
-## About Checksums
-
-A checksum has to do with error-detection. There are a number of different
-ways in which a checksum could be calculated.
-
-When transmitting data, you might also send along a checksum that says how
-many bytes of data are being sent. That means that when the data arrives on
-the other side, you can count the bytes and compare it to the checksum. If
-these are different, then the data has been garbled in transmission.
-
-In the Luhn problem the final digit acts as a sanity check for all the prior
-digits. Running those prior digits through a particular algorithm should give
-you that final digit.
-
-It doesn't actually tell you if it's a real credit card number, only that it's
-a plausible one. It's the same thing with the bytes that get transmitted --
-you could have the right number of bytes and still have a garbled message. So
-checksums are a simple sanity-check, not a real in-depth verification of the
-authenticity of some data. It's often a cheap first pass, and can be used to
-quickly discard obviously invalid things.
+The [Luhn algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) is
+a simple checksum formula used to validate a variety of identification
+numbers, such as credit card numbers and Canadian Social Insurance
+Numbers.
 
+The task is to write a function that checks if a given string is valid.
+
+Validating a Number
+------
+
+As an example, here is a valid (but fictitious) Canadian Social Insurance
+Number.
+
+```
+046 454 286
+```
+
+The first step of the Luhn algorithm is to double every second digit,
+starting from the right. We will be doubling
+
+```
+_4_ 4_4 _8_
+```
+
+If doubling the number results in a number greater than 9 then subtract 9
+from the product. The results of our doubling:
+
+```
+086 858 276
+```
+
+Then sum all of the digits
+
+```
+0+8+6+8+5+8+2+7+6 = 50
+```
+
+If the sum is evenly divisible by 10, then the number is valid. This number is valid!
+
+An example of an invalid Canadian SIN where we've changed the final digit
+
+```
+046 454 287
+```
+
+Double the second digits, starting from the right
+
+```
+086 858 277
+```
+
+Sum the digits
+
+```
+0+8+6+8+5+8+2+7+7 = 51
+```
+
+51 is not evenly divisible by 10, so this number is not valid.
+
+----
+
+An example of an invalid credit card account
+
+```
+8273 1232 7352 0569
+```
+
+Double the second digits, starting from the right
+
+```
+7253 2262 5312 0539
+```
+
+Sum the digits
+
+```
+7+2+5+3+2+2+5+2+5+3+1+2+0+5+3+9 = 57
+```
+
+57 is not evenly divisible by 10, so this number is not valid.

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.6.8"
+  VERSION = "2.0.6.9"
 end

data/tracks/csharp/exercises/accumulate/AccumulateTest.cs

@@ -62,4 +62,13 @@ public class AccumulateTest
         accumulation.ToList();
         Assert.That(counter, Is.EqualTo(3));
     }
+
+    [Ignore("Remove to run test")]
+    [Test]
+    public void Accumulate_allows_different_return_type()
+    {
+        Assert.That(
+            new[] { 1, 2, 3 }.Accumulate(x => x.ToString()), 
+            Is.EqualTo(new[] { "1", "2", "3" }));
+    }
 }

data/tracks/csharp/exercises/accumulate/Example.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 public static class AccumulateExtensions
 {
-    public static IEnumerable<T> Accumulate<T>(this IEnumerable<T> collection, Func<T, T> func)
+    public static IEnumerable<U> Accumulate<T, U>(this IEnumerable<T> collection, Func<T, U> func)
     {
         foreach (var item in collection)
             yield return func(item);

data/tracks/csharp/exercises/luhn/Example.cs

@@ -1,22 +1,23 @@
 using System;
 using System.Linq;
 
-public class Luhn
+public static class Luhn
 {
-    private readonly long number;
+    public static bool IsValid(string number)
+    {
+        number = number.Replace(" ", "");
 
-    public long CheckDigit { get { return number % 10; } }
-    public int[] Addends { get; private set; }
-    public int Checksum { get { return Addends.Sum(); } }
-    public bool Valid { get { return Checksum % 10 == 0; } }
+        if (number.Length < 2 || number.Any(c => c < '0' || c > '9'))
+        {
+            return false;
+        }
 
-    public Luhn(long number)
-    {
-        this.number = number;
-        Addends = GenerateAddends();
+        var checksum = GenerateChecksum(number);
+
+        return checksum % 10 == 0;
     }
 
-    private int[] GenerateAddends()
+    private static int GenerateChecksum(string number)
     {
         var reversedIntArray = SplitToReversedIntArray(number);
         for (int i = 1; i < reversedIntArray.Length; i++)
@@ -25,12 +26,12 @@ public class Luhn
                 reversedIntArray[i] = ConvertDigitForAddend(reversedIntArray[i]);
         }
         Array.Reverse(reversedIntArray);
-        return reversedIntArray;
+        return reversedIntArray.Sum();
     }
 
-    private static int[] SplitToReversedIntArray(long value)
+    private static int[] SplitToReversedIntArray(string value)
     {
-        return value.ToString().Select(c => int.Parse(c.ToString())).Reverse().ToArray();
+        return value.Select(c => int.Parse(c.ToString())).Reverse().ToArray();
     }
 
     private static int ConvertDigitForAddend(int value)
@@ -38,21 +39,4 @@ public class Luhn
         var doubled = value * 2;
         return doubled < 10 ? doubled : doubled - 9;
     }
-
-    public static long Create(long number)
-    {
-        var zeroCheckDigitNumber = number * 10;
-        var luhn = new Luhn(zeroCheckDigitNumber);
-
-        if (luhn.Valid)
-            return zeroCheckDigitNumber;
-
-        return zeroCheckDigitNumber + CreateCheckDigit(luhn.Checksum);
-    }
-
-    private static int CreateCheckDigit(int value)
-    {
-        var nearestTen = (int)(Math.Ceiling(value / 10.0m) * 10);
-        return nearestTen - value;
-    }
 }

data/tracks/csharp/exercises/luhn/LuhnTest.cs

@@ -3,60 +3,14 @@ using NUnit.Framework;
 [TestFixture]
 public class LuhnTest
 {
-    [Test]
-    public void Check_digit_is_the_rightmost_digit()
-    {
-        Assert.That(new Luhn(34567).CheckDigit, Is.EqualTo(7));
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
-    public void Addends_doubles_every_other_number_from_the_right()
-    {
-        Assert.That(new Luhn(12121).Addends, Is.EqualTo(new[] { 1, 4, 1, 4, 1 }));
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
-    public void Addends_subtracts_9_when_doubled_number_is_more_than_9()
-    {
-        Assert.That(new Luhn(8631).Addends, Is.EqualTo(new[] { 7, 6, 6, 1 }));
-    }
-
-    [Ignore("Remove to run test")]
-    [TestCase(4913, ExpectedResult = 22)]
-    [TestCase(201773, ExpectedResult = 21)]
-    public int Checksum_adds_addends_together(int number)
-    {
-        return new Luhn(number).Checksum;
-    }
-
-    [Ignore("Remove to run test")]
-    [TestCase(738, ExpectedResult = false)]
-    [TestCase(8739567, ExpectedResult = true)]
-    public bool Number_is_valid_when_checksum_mod_10_is_zero(int number)
-    {
-        return new Luhn(number).Valid;
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
-    public void Luhn_can_create_simple_numbers_with_valid_check_digit()
-    {
-        Assert.That(Luhn.Create(123), Is.EqualTo(1230));
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
-    public void Luhn_can_create_larger_numbers_with_valid_check_digit()
-    {
-        Assert.That(Luhn.Create(873956), Is.EqualTo(8739567));
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
-    public void Luhn_can_create_huge_numbers_with_valid_check_digit()
-    {
-        Assert.That(Luhn.Create(837263756), Is.EqualTo(8372637564));
+    [TestCase("1", ExpectedResult = false)] // single digit strings can not be valid
+    [TestCase("0", ExpectedResult = false, Ignore = "Remove to run test")] // a single zero is invalid
+    [TestCase("046 454 286", ExpectedResult = true, Ignore = "Remove to run test")] // valid Canadian SIN
+    [TestCase("046 454 287", ExpectedResult = false, Ignore = "Remove to run test")] // invalid Canadian SIN
+    [TestCase("8273 1232 7352 0569", ExpectedResult = false, Ignore = "Remove to run test")] // invalid credit card
+    [TestCase("827a 1232 7352 0569", ExpectedResult = false, Ignore = "Remove to run test")] // strings that contain non-digits are not valid
+    public bool ValidateChecksum(string number)
+    {
+        return Luhn.IsValid(number);
     }
 }

data/tracks/fsharp/exercises/luhn/Example.fs

@@ -1,29 +1,27 @@
 module Luhn
-        
-let digit c = (int)c - (int)'0'
-let digits number = number.ToString() |> Seq.map digit
 
-let addend index digit = 
+let private digit c = (int)c - (int)'0'
+let private digits number = number.ToString() |> Seq.map digit
+
+let private addend index digit = 
     if (index % 2 = 0) then digit else 
     if (digit >= 5) then digit * 2 - 9 
     else digit * 2
 
-let checkDigit (number:int64) = number % 10L
-
-let addends (number:int64) = 
-    number 
-    |> digits 
+let private addends number = 
+    number
     |> List.ofSeq 
     |> List.rev 
     |> List.mapi addend 
     |> List.rev
 
-let checksum (number:int64) = (number |> addends |> List.sum) % 10
-
-let valid (number:int64) = checksum number = 0
-
-let create (target:int64) = 
-    let targetNumber = target * 10L
+let private checksum number = (number |> digits |> addends |> List.sum) % 10
 
-    if valid targetNumber then targetNumber
-    else targetNumber + 10L - (int64)(checksum targetNumber)
+let valid (number : string) =
+    let noSpaces = number.Replace(" ", "")
+    match Seq.length noSpaces with
+    | 0 | 1 -> false
+    | _ ->
+        match Seq.forall (fun c -> c >= '0' && c <= '9') noSpaces with
+        | false -> false
+        | true  -> checksum noSpaces = 0

data/tracks/fsharp/exercises/luhn/LuhnTest.fs

@@ -3,41 +3,11 @@ module LuhnTest
 open NUnit.Framework
 open Luhn
   
-[<Test>]
-let ``Check digit is the rightmost digit`` () =
-    Assert.That(checkDigit 34567L, Is.EqualTo 7)
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Addends doubles every other number from the right`` () =
-    Assert.That(addends 12121L, Is.EqualTo [1; 4; 1; 4; 1])
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Addends subtracts 9 when doubled number is more than 9`` () =
-    Assert.That(addends 8631L, Is.EqualTo [7; 6; 6; 1])
-
-[<TestCase(4913, ExpectedResult = 2)>]
-[<TestCase(201773, ExpectedResult = 1)>]
-let ``Checksum adds addends together`` (number) =
-    checksum number
-
-[<TestCase(738, ExpectedResult = false)>]
-[<TestCase(8739567, ExpectedResult = true)>]
-let ``Number is valid when checksum mod 10 is zero`` (number) =
-    valid number
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Luhn can create simple numbers with valid check digit`` () =
-    Assert.That(create 123L, Is.EqualTo(1230))
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Luhn can create larger numbers with valid check digit`` () =
-    Assert.That(create 873956L, Is.EqualTo(8739567))
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Luhn can create huge numbers with valid check digit`` () =
-    Assert.That(create 837263756L, Is.EqualTo(8372637564L))
+[<TestCase("1", ExpectedResult = false)>] // single digit strings can not be valid
+[<TestCase("0", ExpectedResult = false, Ignore = "Remove to run test")>] // a single zero is invalid
+[<TestCase("046 454 286", ExpectedResult = true, Ignore = "Remove to run test")>] // valid Canadian SIN
+[<TestCase("046 454 287", ExpectedResult = false, Ignore = "Remove to run test")>] // invalid Canadian SIN
+[<TestCase("8273 1232 7352 0569", ExpectedResult = false, Ignore = "Remove to run test")>] // invalid credit card
+[<TestCase("827a 1232 7352 0569", ExpectedResult = false, Ignore = "Remove to run test")>] // strings that contain non-digits are not valid
+let ``Validate checksum`` number =
+    valid number

data/tracks/java/config.json

@@ -54,6 +54,7 @@
     "custom-set",
     "wordy",
     "palindrome-products",
+    "twelve-days",
     "sublist"
   ],
   "exercises": [
@@ -307,6 +308,11 @@
       "difficulty": 1,
       "topics": []
     },
+    {
+      "slug": "twelve-days",
+      "difficulty": 1,
+      "topics": []
+    },
     {
       "slug": "sublist",
       "difficulty": 1,

data/tracks/java/exercises/settings.gradle

@@ -52,3 +52,5 @@ include 'triangle'
 include 'trinary'
 include 'word-count'
 include 'wordy'
+include 'twelve-days'
+

data/tracks/java/exercises/twelve-days/build.gradle

@@ -0,0 +1,17 @@
+apply plugin: "java"
+apply plugin: "eclipse"
+apply plugin: "idea"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile "junit:junit:4.12"
+}
+test {
+    testLogging {
+        exceptionFormat = 'full'
+        events = ["passed", "failed", "skipped"]
+    }
+}

data/tracks/java/exercises/twelve-days/src/example/java/TwelveDays.java

@@ -0,0 +1,46 @@
+public class TwelveDays {
+    private static String[] days = new String[] {"first", "second", "third", "fourth", "fifth", "sixth", "seventh",
+        "eighth", "ninth", "tenth", "eleventh", "twelfth"};
+    private static String[] gifts = new String[] {
+            "a Partridge in a Pear Tree.",
+            "two Turtle Doves, ",
+            "three French Hens, ",
+            "four Calling Birds, ",
+            "five Gold Rings, ",
+            "six Geese-a-Laying, ",
+            "seven Swans-a-Swimming, ",
+            "eight Maids-a-Milking, ",
+            "nine Ladies Dancing, ",
+            "ten Lords-a-Leaping, ",
+            "eleven Pipers Piping, ",
+            "twelve Drummers Drumming, "
+    };
+
+    public static String verse(int verseNumber) {
+        return constructVerse(verseNumber);
+    }
+
+    public static String verses(int verseNumberStart, int verseNumberEnd) {
+        StringBuilder stringBuilder = new StringBuilder(constructVerse(verseNumberStart));
+        for (int i = verseNumberStart + 1; i <= verseNumberEnd; i++) {
+            stringBuilder.append("\n");
+            stringBuilder.append(constructVerse(i));
+        }
+        return stringBuilder.toString();
+    }
+
+    public static String sing() {
+        return verses(1, 12);
+    }
+
+    private static String constructVerse(int verseNumber) {
+        StringBuilder stringBuilder = new StringBuilder("On the " + days[verseNumber - 1]
+                + " day of Christmas my true love gave to me, ");
+        for (int i = verseNumber; i > 0; i--) {
+            if (verseNumber != 1 && i == 1) stringBuilder.append("and ");
+            stringBuilder.append(gifts[i - 1]);
+        }
+        stringBuilder.append("\n");
+        return stringBuilder.toString();
+    }
+}

data/tracks/java/exercises/twelve-days/src/test/java/TwelveDaysTest.java

@@ -0,0 +1,172 @@
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TwelveDaysTest {
+
+    @Test
+    public void testVerseOne() {
+        String expectedVerseOne = "On the first day of Christmas my true love gave to me, " +
+                "a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseOne, TwelveDays.verse(1));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseTwo() {
+        String expectedVerseTwo = "On the second day of Christmas my true love gave to me, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseTwo, TwelveDays.verse(2));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseThree() {
+        String expectedVerseThree = "On the third day of Christmas my true love gave to me, three French Hens, " +
+                "two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseThree, TwelveDays.verse(3));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseFour() {
+        String expectedVerseFour = "On the fourth day of Christmas my true love gave to me, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseFour, TwelveDays.verse(4));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseFive() {
+        String expectedVerseFive = "On the fifth day of Christmas my true love gave to me, five Gold Rings, " +
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseFive, TwelveDays.verse(5));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseSix() {
+        String expectedVerseSix = "On the sixth day of Christmas my true love gave to me, six Geese-a-Laying, " +
+                "five Gold Rings, four Calling Birds, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseSix, TwelveDays.verse(6));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseSeven() {
+        String expectedVerseSeven = "On the seventh day of Christmas my true love gave to me, " +
+                "seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, three French Hens, " +
+                "two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseSeven, TwelveDays.verse(7));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseEight() {
+        String expectedVerseEight = "On the eighth day of Christmas my true love gave to me, eight Maids-a-Milking," +
+                " seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseEight, TwelveDays.verse(8));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseNine() {
+        String expectedVerseNine = "On the ninth day of Christmas my true love gave to me, nine Ladies Dancing, " +
+                "eight Maids-a-Milking, seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, " +
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseNine, TwelveDays.verse(9));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseTen() {
+        String expectedVerseTen = "On the tenth day of Christmas my true love gave to me, ten Lords-a-Leaping, " +
+                "nine Ladies Dancing, eight Maids-a-Milking, seven Swans-a-Swimming, six Geese-a-Laying, " +
+                "five Gold Rings, four Calling Birds, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseTen, TwelveDays.verse(10));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseEleven() {
+        String expectedVerseEleven = "On the eleventh day of Christmas my true love gave to me, " +
+                "eleven Pipers Piping, ten Lords-a-Leaping, nine Ladies Dancing, eight Maids-a-Milking, " +
+                "seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseEleven, TwelveDays.verse(11));
+    }
+
+    @Ignore
+    @Test
+    public void testVerseTwelve() {
+        String expectedVerseTwelve = "On the twelfth day of Christmas my true love gave to me, " +
+                "twelve Drummers Drumming, eleven Pipers Piping, ten Lords-a-Leaping, nine Ladies Dancing, " +
+                "eight Maids-a-Milking, seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, " +
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseTwelve, TwelveDays.verse(12));
+    }
+
+    @Ignore
+    @Test
+    public void testMultipleVerses() {
+        String expectedVerseOneToThree = "On the first day of Christmas my true love gave to me, " +
+                "a Partridge in a Pear Tree.\n\n" +
+                "On the second day of Christmas my true love gave to me, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n\n" +
+                "On the third day of Christmas my true love gave to me, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVerseOneToThree, TwelveDays.verses(1, 3));
+    }
+
+    @Ignore
+    @Test
+    public void testSingWholeSong() {
+        String expectedSong = "On the first day of Christmas my true love gave to me, a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the second day of Christmas my true love gave to me, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the third day of Christmas my true love gave to me, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the fourth day of Christmas my true love gave to me, four Calling Birds, three French Hens, " +
+                "two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the fifth day of Christmas my true love gave to me, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the sixth day of Christmas my true love gave to me, six Geese-a-Laying, five Gold Rings, " +
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the seventh day of Christmas my true love gave to me, seven Swans-a-Swimming, " +
+                "six Geese-a-Laying, five Gold Rings, four Calling Birds, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the eighth day of Christmas my true love gave to me, eight Maids-a-Milking, " +
+                "seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the ninth day of Christmas my true love gave to me, nine Ladies Dancing, eight Maids-a-Milking," +
+                " seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the tenth day of Christmas my true love gave to me, ten Lords-a-Leaping, nine Ladies Dancing," +
+                " eight Maids-a-Milking, seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, " +
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the eleventh day of Christmas my true love gave to me, eleven Pipers Piping, " +
+                "ten Lords-a-Leaping, nine Ladies Dancing, eight Maids-a-Milking, seven Swans-a-Swimming, " +
+                "six Geese-a-Laying, five Gold Rings, four Calling Birds, three French Hens, two Turtle Doves, " +
+                "and a Partridge in a Pear Tree.\n" +
+                "\n" +
+                "On the twelfth day of Christmas my true love gave to me, twelve Drummers Drumming, " +
+                "eleven Pipers Piping, ten Lords-a-Leaping, nine Ladies Dancing, eight Maids-a-Milking, " +
+                "seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, " +
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedSong, TwelveDays.sing());
+    }
+}

data/tracks/ocaml/tools/test-generator/src/controller.ml

@@ -28,7 +28,7 @@ let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_fil
   let fill_in_template = fill_in_template edit_expected edit_parameters in
   let open Result.Monad_infix in
   Result.of_option template ("cannot recognize file for " ^ slug ^ " as a template") >>= fun template ->
-  parse_json_text canonical_data_file (expected_key_name slug)
+  parse_json_text canonical_data_file (expected_key_name slug) (cases_name slug)
   |> Result.map_error ~f:show_error >>= (function
       | Single cases ->
         fill_in_template template.template slug cases
@@ -60,7 +60,7 @@ let check_canonical_data canonical_data_folder =
   let canonical_data_files = List.sort canonical_data_files ~cmp:(fun (s1, _) (s2, _) -> String.compare s1 s2) in
   let total_count = List.length canonical_data_files in
   List.iter canonical_data_files ~f:(fun (slug, text) ->
-    match parse_json_text text (expected_key_name slug) with
+    match parse_json_text text (expected_key_name slug) (cases_name slug) with
     | Error e -> print_endline @@ slug ^ ": " ^ (show_error e)
     | _ -> ok_count := !ok_count + 1
   );

data/tracks/ocaml/tools/test-generator/src/parser.ml

@@ -55,45 +55,45 @@ let parse_case (expected_key: string) (s: json): (case, error) Result.t = match
   | `Assoc assoc -> parse_case_assoc assoc expected_key
   | _ -> Error ExpectingMapForCase
 
-let parse_cases (text: string): (json, error) Result.t =
-  match from_string text |> member "cases" with
+let parse_cases (text: string) (cases_key: string): (json, error) Result.t =
+  match from_string text |> member cases_key with
     | `Null -> Error (TestMustHaveKeyCalledCases "xx")
     | json -> Ok json
 
-let parse_single (text: string) (expected_key: string): (tests, error) Result.t =
+let parse_single (text: string) (expected_key: string) (cases_key: string): (tests, error) Result.t =
   let open Result.Monad_infix in
-  parse_cases text >>=
+  parse_cases text cases_key >>=
   to_list_note ExpectingListOfCases >>=
   (sequence >> (List.map ~f:(parse_case expected_key))) >>= fun ts ->
   Result.return (Single ts)
 
-let is_suite (json: json) =
+let is_suite (json: json) (cases_key: string) =
   let keys = List.filter (keys json) ~f:(fun k -> k <> "methods") in
   let keys = List.sort keys ~cmp:String.compare in
-  not (List.is_empty keys || keys = ["cases"] || keys = ["#"; "cases"])
+  not (List.is_empty keys || keys = [cases_key] || keys = ["#"; cases_key])
 
 let merge_result = function
   | (_, Error x) -> Error x
   | (n, Ok c) -> Ok {name = n; cases = c}
 
-let parse_cases_from_suite name suite expected_key =
+let parse_cases_from_suite name suite expected_key cases_key =
   let open Result.Monad_infix in
-  member_note (TestMustHaveKeyCalledCases name) "cases" suite >>=
+  member_note (TestMustHaveKeyCalledCases name) cases_key suite >>=
   to_list_note ExpectingListOfCases >>= fun tests ->
   List.map tests ~f:(parse_case expected_key) |> sequence
 
-let parse_json_text (text: string) (expected_key: string): (tests, error) Result.t =
+let parse_json_text (text: string) (expected_key: string) (cases_key: string): (tests, error) Result.t =
   let open Result.Monad_infix in
   let json = from_string text in
-  if is_suite json
+  if is_suite json cases_key
   then
     to_assoc_note UnrecognizedJson json >>= fun tests ->
     let tests = List.filter tests ~f:(fun (n, _) -> n <> "#") in
-    let tests = List.map tests ~f:(fun (name, suite) -> merge_result (name, parse_cases_from_suite name suite expected_key)) in
+    let tests = List.map tests ~f:(fun (name, suite) -> merge_result (name, parse_cases_from_suite name suite expected_key cases_key)) in
     sequence tests >>= fun tests ->
     Ok (Suite tests)
   else
-    parse_single text expected_key
+    parse_single text expected_key cases_key
 
 let show_error = function
   | TestMustHaveKeyCalledCases name -> "Test named '" ^ name ^ "' is expected to have an object with a key: 'cases'"

data/tracks/ocaml/tools/test-generator/src/special_cases.ml

@@ -59,3 +59,7 @@ let edit_parameters ~(slug: string) (parameters: (string * string) list) = match
 let expected_key_name slug = match slug with
 | "dominoes" -> "can_chain"
 | _ -> "expected"
+
+let cases_name slug = match slug with
+| "luhn" -> "valid"
+| _ -> "cases"

data/tracks/ocaml/tools/test-generator/templates/luhn/template.ml

@@ -0,0 +1,16 @@
+open Core.Std
+open OUnit2
+open Luhn
+
+let assert_valid expected input _test_ctxt = 
+  assert_equal ~printer:Bool.to_string expected (valid input)
+
+let tests = [
+(* TEST
+  "$description" >::
+    assert_valid $expected "$input";
+END TEST *)
+]
+
+let () =
+  run_test_tt_main ("luhn tests" >::: tests)

data/tracks/ocaml/tools/test-generator/test/parser_test.ml

@@ -12,11 +12,11 @@ let ae exp got _test_ctxt = assert_equal exp got ~printer:show_cases
 
 let single x = Ok (Single x)
 
-let call_parser json = parse_json_text json "expected"
+let call_parser json = parse_json_text json "expected" "cases"
 
 let parser_tests = [
   "parses empty json as empty list" >::
-    ae (single []) (call_parser "{\"cases\" : []}");
+    ae (single []) (parse_json_text "{\"test-cases\" : []}" "expected" "test-cases");
 
   "gives an error with a json map that does not have the key cases in" >::
     ae (Error (TestMustHaveKeyCalledCases "case"))

data/tracks/pascal/config.json

@@ -1,6 +1,6 @@
 {
   "slug": "pascal",
-  "language": "Pascal",
+  "language": "Object Pascal",
   "repository": "https://github.com/exercism/xpascal",
   "active": false,
   "exercises": [

data/tracks/pascal/exercises/hello-world/uTestHelloWorld.pas

@@ -9,13 +9,12 @@ type
   HelloWorldTest = class(TObject)
   public
     [Test]
-//    [Ignore]
     procedure test_no_name;
     [Test]
-//    [Ignore]
+    [Ignore('Comment this line to run this test')]
     procedure test_sample_name;
     [Test]
-//    [Ignore]
+    [Ignore('Comment this line to run this test')]
     procedure test_other_sample_name;
   end;
 

data/tracks/scala/config.json

@@ -349,18 +349,27 @@
       "slug": "pascals-triangle",
       "difficulty": 1,
       "topics": [
+        "Control-flow (loops)",
+        "Lists",
+				"Mathematics"
       ]
 		},
     {
       "slug": "pig-latin",
       "difficulty": 1,
       "topics": [
+        "Strings",
+        "Transforming"
       ]
 		},
     {
       "slug": "pythagorean-triplet",
       "difficulty": 1,
       "topics": [
+        "Integers",
+        "Mathematics",
+        "Sequences",
+        "Tuples"
       ]
 		},
     {

data/tracks/scala/exercises/pascals-triangle/build.sbt

@@ -1,3 +1,3 @@
-scalaVersion := "2.11.7"
+scalaVersion := "2.12.1"
 
-libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.5" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"

data/tracks/scala/exercises/pig-latin/build.sbt

@@ -1,3 +1,3 @@
-scalaVersion := "2.11.7"
+scalaVersion := "2.12.1"
 
-libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.5" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"

data/tracks/scala/exercises/pythagorean-triplet/build.sbt

@@ -1,3 +1,4 @@
-scalaVersion := "2.11.7"
+scalaVersion := "2.12.1"
+
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
 
-libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.5" % "test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.6.8
+  version: 2.0.6.9
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -3756,6 +3756,10 @@ files:
 - tracks/java/exercises/trinary/src/example/java/Trinary.java
 - tracks/java/exercises/trinary/src/main/java/.keep
 - tracks/java/exercises/trinary/src/test/java/TrinaryTest.java
+- tracks/java/exercises/twelve-days/build.gradle
+- tracks/java/exercises/twelve-days/src/example/java/TwelveDays.java
+- tracks/java/exercises/twelve-days/src/main/java/.keep
+- tracks/java/exercises/twelve-days/src/test/java/TwelveDaysTest.java
 - tracks/java/exercises/word-count/build.gradle
 - tracks/java/exercises/word-count/src/example/java/WordCount.java
 - tracks/java/exercises/word-count/src/main/java/.keep
@@ -5058,6 +5062,7 @@ files:
 - tracks/ocaml/tools/test-generator/templates/hamming/template.ml
 - tracks/ocaml/tools/test-generator/templates/hello-world/template.ml
 - tracks/ocaml/tools/test-generator/templates/leap/template.ml
+- tracks/ocaml/tools/test-generator/templates/luhn/template.ml
 - tracks/ocaml/tools/test-generator/templates/minesweeper/template.ml
 - tracks/ocaml/tools/test-generator/templates/raindrops/template.ml
 - tracks/ocaml/tools/test-generator/templates/say/template.ml