trackler 2.0.6.36 → 2.0.6.37

data/tracks/java/exercises/phone-number/src/test/java/PhoneNumberTest.java

@@ -1,11 +1,16 @@
-import org.junit.Test;
 import org.junit.Ignore;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class PhoneNumberTest {
+    private final static String wrongLengthExceptionMessage = "Number must be 10 or 11 digits";
+    private final static String numberIs11DigitsButDoesNotStartWith1ExceptionMessage =
+            "Can only have 11 digits if number starts with '1'";
+    private final static String illegalCharacterExceptionMessage =
+            "Illegal character in phone number. Only digits, spaces, parentheses, hyphens or dots accepted.";
 
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
@@ -16,7 +21,7 @@ public class PhoneNumberTest {
         final String actualNumber = new PhoneNumber("(123) 456-7890").getNumber();
 
         assertEquals(
-            expectedNumber, actualNumber
+                expectedNumber, actualNumber
         );
     }
 
@@ -27,68 +32,77 @@ public class PhoneNumberTest {
         final String actualNumber = new PhoneNumber("123.456.7890").getNumber();
 
         assertEquals(
-            expectedNumber, actualNumber
+                expectedNumber, actualNumber
         );
     }
 
     @Ignore
     @Test
-    public void validWhen11DigitsAndFirstIs1() {
+    public void cleansNumberWithMultipleSpaces() {
         final String expectedNumber = "1234567890";
-        final String actualNumber = new PhoneNumber("11234567890").getNumber();
+        final String actualNumber = new PhoneNumber("123 456   7890   ").getNumber();
 
         assertEquals(
-            expectedNumber, actualNumber
+                expectedNumber, actualNumber
         );
     }
 
     @Ignore
     @Test
-    public void invalidWhenOnly11Digits() {
+    public void invalidWhen9Digits() {
         expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("Can only have 11 digits if number starts with '1'");
-        new PhoneNumber("21234567890").getNumber();
+        expectedException.expectMessage(wrongLengthExceptionMessage);
+        new PhoneNumber("123456789");
     }
 
     @Ignore
     @Test
-    public void invalidWhen9Digits() {
+    public void invalidWhen11Digits() {
         expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("Number must be 10 or 11 digits");
-        new PhoneNumber("123456789").getNumber();
+        expectedException.expectMessage(numberIs11DigitsButDoesNotStartWith1ExceptionMessage);
+        new PhoneNumber("21234567890");
     }
 
     @Ignore
     @Test
-    public void areaCode() {
-        final String expectedAreaCode = "123";
-        final String actualAreaCode = new PhoneNumber("1234567890").getAreaCode();
+    public void validWhen11DigitsAndFirstIs1() {
+        final String expectedNumber = "1234567890";
+        final String actualNumber = new PhoneNumber("11234567890").getNumber();
 
         assertEquals(
-            expectedAreaCode, actualAreaCode
+                expectedNumber, actualNumber
         );
     }
 
     @Ignore
     @Test
-    public void prettyPrint() {
-        final String expectedPrettyNumber = "(123) 456-7890";
-        final String actualPrettyNumber = new PhoneNumber("1234567890").pretty();
-
-        assertEquals(
-            expectedPrettyNumber, actualPrettyNumber
-        );
+    public void invalidWhen12Digits() {
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage(wrongLengthExceptionMessage);
+        new PhoneNumber("321234567890");
     }
 
     @Ignore
     @Test
-    public void prettyPrintWithFullUSPhoneNumber() {
-        final String expectedPrettyNumber = "(123) 456-7890";
-        final String actualPrettyNumber = new PhoneNumber("11234567890").pretty();
+    public void invalidWithLetters() {
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage(illegalCharacterExceptionMessage);
+        new PhoneNumber("123-abc-7890");
+    }
 
-        assertEquals(
-            expectedPrettyNumber, actualPrettyNumber
-        );
+    @Ignore
+    @Test
+    public void invalidWithPunctuation() {
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage(illegalCharacterExceptionMessage);
+        new PhoneNumber("123-@:!-7890");
     }
 
+    @Ignore
+    @Test
+    public void invalidWithRightNumberOfDigitsButLettersMixedIn() {
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage(illegalCharacterExceptionMessage);
+        new PhoneNumber("1a2b3c4d5e6f7g8h9i0j");
+    }
 }

data/tracks/ocaml/README.md

@@ -47,6 +47,17 @@ In this example, the Makefile would look for an implementation in ocaml_exercise
 
 All pull requests are run through a Travis CI build, which compiles and runs tests.
 
+## Canonical test data
+
+If you are implementing an existing test, there may be "canonical data" for it in the [x-common](https://github.com/exercism/x-common) repository.
+An example: https://github.com/exercism/x-common/blob/master/exercises/bracket-push/canonical-data.json
+
+You should base your tests off this data, in order to provide consistency across different language tracks.
+
+There is a test generator which can create test code from these json files and an OCaml template file that you 
+would need to create. It is a work in progress, so may not work for every exercise. If you wish to use it, there
+is documentation [here](tools/test-generator/README.md).
+
 ## Feedback
 
 If you find this documentation is inaccurate or incomplete, or can be improved in any way, please don't hesitate to raise an [issue](https://github.com/exercism/xocaml/issues) or submit a pull request.

data/tracks/ocaml/tools/test-generator/README.md

@@ -1 +1,39 @@
-Placeholder
+## What does it do
+
+The test generator takes canonical-data.json files from the x-common folder, and
+uses them to create Ocaml tests.
+
+For each exercise, it requires a template file under the tools/test-generator/templates folder.
+The template format is rather ad-hoc, but works for most of the exercises that have
+canonical data.
+
+## Building
+
+In the folder tools/test-generator, type ```Make```
+This will build and run the unit tests
+
+## Running
+
+The test generator should be run whenever test canonical data is updated.
+
+You will need the latest version of x-common checked out locally, at the same level as your
+xocaml repo. 
+
+Please note: running will overwrite tests in the xocaml/exercises folders (this is the default, there
+is a command line option to write the tests to a different folder - run test_gen.native --help).
+
+To run, type test_gen.native at the command line.
+
+If you type git status, you will see test files that have been updated.
+
+Some files can be generated but will look better after hand-editing. An example is the minesweeper exercise,
+where a list that is part of the input is better presented in a 2D vertically aligned format. To handle this,
+the test generator saves it's files in a folder in your home (~/.xocaml-generated - this can be overridden as 
+a command line option). If after generation, the file is unchanged from the saved copy, then the test generator
+will not overwrite the test in the repo - so git status will be clean.
+
+## Extending
+
+If you find an exercise that the generator cannot handle, pull requests to extend it are welcome.
+
+

data/tracks/perl6/.travis.yml

@@ -8,4 +8,4 @@ before_script:
   - bin/fetch-configlet
 script:
   - bin/configlet .
-  - EXERCISM=1 prove -vr --exec=perl6 exercises/
+  - prove -re perl6 exercises/

data/tracks/perl6/exercises/allergies/allergies.t

@@ -3,15 +3,14 @@
 use Test;
 use JSON::Tiny;
 
-use lib ( my $dir = IO::Path.new($?FILE).parent ).path;
+use lib $?FILE.IO.dirname;
 
 my $module = %*ENV<EXERCISM> ?? 'Example' !! 'Allergies';
 require ::($module) <&allergic-to &list-allergies>;
 
 plan 2;
 
-my %cases = from-json $dir.child('cases.json').slurp;
-
+my %cases;
 subtest 'allergic-to' => {
     my @cases = |%cases{'allergic_to'}{'cases'};
 
@@ -38,3 +37,119 @@ subtest 'list' => {
             or diag $_;
     }
 };
+
+done-testing;
+
+INIT {
+  %cases := from-json ｢
+    {
+      "allergic_to": {
+        "description": [
+          "Given a number and a substance, indicate whether Tom is allergic ",
+          "to that substance.",
+          "Test cases for this method involve more than one assertion.",
+          "Each case in 'expected' specifies what the method should return for",
+          "the given substance."
+        ],
+        "cases": [
+          {
+            "description": "no allergies means not allergic",
+            "score": 0,
+            "expected": [
+              {
+                "substance": "peanuts",
+                "result": false
+              },
+              {
+                "substance": "cats",
+                "result": false
+              },
+              {
+                "substance": "strawberries",
+                "result": false
+              }
+            ]
+          },
+          {
+            "description": "is allergic to eggs",
+            "score": 1,
+            "expected": [
+              {
+                "substance": "eggs",
+                "result": true
+              }
+            ]
+          },
+          {
+            "description": "allergic to eggs in addition to other stuff",
+            "score": 5,
+            "expected": [
+              {
+                "substance": "eggs",
+                "result": true
+              },
+              {
+                "substance": "shellfish",
+                "result": true
+              },
+              {
+                "substance": "strawberries",
+                "result": false
+              }
+            ]
+          }
+        ]
+      },
+      "list": {
+        "description": ["Given a number, list all things Tom is allergic to"],
+        "cases": [
+          {
+            "description": "no allergies at all",
+            "score": 0,
+            "expected": []
+          },
+          {
+            "description": "allergic to just eggs",
+            "score": 1,
+            "expected": ["eggs"]
+          },
+          {
+            "description": "allergic to just peanuts",
+            "score": 2,
+            "expected": ["peanuts"]
+          },
+          {
+            "description": "allergic to just strawberries",
+            "score": 8,
+            "expected": ["strawberries"]
+          },
+          {
+            "description": "allergic to eggs and peanuts",
+            "score": 3,
+            "expected": ["eggs", "peanuts"]
+          },
+          {
+            "description": "allergic to more than eggs but not peanuts",
+            "score": 5,
+            "expected": ["eggs", "shellfish"]
+          },
+          {
+            "description": "allergic to lots of stuff",
+            "score": 248,
+            "expected": ["strawberries", "tomatoes", "chocolate", "pollen", "cats"]
+          },
+          {
+            "description": "allergic to everything",
+            "score": 255,
+            "expected": ["eggs", "peanuts", "shellfish", "strawberries", "tomatoes", "chocolate", "pollen", "cats"]
+          },
+          {
+            "description": "ignore non allergen score parts",
+            "score": 509,
+            "expected": ["eggs", "shellfish", "strawberries", "tomatoes", "chocolate", "pollen", "cats"]
+          }
+        ]
+      }
+    }
+  ｣
+}

data/tracks/perl6/exercises/atbash-cipher/atbash-cipher.t

@@ -3,15 +3,14 @@
 use Test;
 use JSON::Tiny;
 
-use lib ( my $dir = IO::Path.new($?FILE).parent ).path;
+use lib $?FILE.IO.dirname;
 
 my $module = %*ENV<EXERCISM> ?? 'Example' !! 'Cipher';
 require ::($module) <&encode &decode>;
 
 plan 2;
 
-my %cases = from-json $dir.child('cases.json').slurp;
-
+my %cases;
 subtest 'encode' => {
     my @cases = |%cases.<encode>.<cases>;
 
@@ -29,3 +28,92 @@ subtest 'decode' => {
     is decode( .<phrase> ), .<expected>, .<description>
         for @cases;
 };
+
+done-testing;
+
+INIT {
+  %cases := from-json ｢
+    {
+      "#": [
+        "The tests are divided into two groups: ",
+        "* Encoding from English to atbash cipher",
+        "* Decoding from atbash cipher to all-lowercase-mashed-together English"
+      ],
+      "encode": {
+        "description": ["Test encoding from English to atbash"],
+        "cases": [
+          {
+            "description": "encode yes",
+            "phrase": "yes",
+            "expected": "bvh"
+          },
+          {
+            "description": "encode no",
+            "phrase": "no",
+            "expected": "ml"
+          },
+          {
+            "description": "encode OMG",
+            "phrase": "OMG",
+            "expected": "lnt"
+          },
+          {
+            "description": "encode spaces",
+            "phrase": "O M G",
+            "expected": "lnt"
+          },
+          {
+            "description": "encode mindblowingly",
+            "phrase": "mindblowingly",
+            "expected": "nrmwy oldrm tob"
+          },
+          {
+            "description": "encode numbers",
+            "phrase": "Testing,1 2 3, testing.",
+            "expected": "gvhgr mt123 gvhgr mt"
+          },
+          {
+            "description": "encode deep thought",
+            "phrase": "Truth is fiction.",
+            "expected": "gifgs rhurx grlm"
+          },
+          {
+            "description": "encode all the letters",
+            "phrase": "The quick brown fox jumps over the lazy dog.",
+            "expected": "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt"
+          },
+          {
+            "description": "encode ignores non ascii",
+            "phrase": "non ascii éignored",
+            "expected": "mlmzh xrrrt mlivw"
+          }
+        ]
+      },
+      "decode": {
+        "description": ["Test decoding from atbash to English"],
+        "cases": [
+          {
+              "description": "decode exercism",
+              "phrase": "vcvix rhn",
+              "expected": "exercism"
+          },
+          {
+              "description": "decode a sentence",
+              "phrase": "zmlyh gzxov rhlug vmzhg vkkrm thglm v",
+              "expected": "anobstacleisoftenasteppingstone"
+          },
+          {
+              "description": "decode numbers",
+              "phrase": "gvhgr mt123 gvhgr mt",
+              "expected": "testing123testing"
+          },
+          {
+              "description": "decode all the letters",
+              "phrase": "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt",
+              "expected": "thequickbrownfoxjumpsoverthelazydog"
+          }
+        ]
+      }
+    }
+  ｣
+}

data/tracks/perl6/exercises/phone-number/phone-number.t

@@ -2,15 +2,14 @@
 use v6;
 use Test;
 use JSON::Tiny;
-use lib my $path = IO::Path.new($?FILE).parent.path;
+use lib $?FILE.IO.dirname;
 
 plan 12;
 my $module = %*ENV<EXERCISM> ?? 'Example' !! 'Phone';
 use-ok $module;
 require ::($module) <Phone>;
 
-my %tests = from-json open("$path/cases.json").slurp-rest;
-
+my %cases;
 subtest 'number, area-code and pretty methods', {
   plan 3;
   ok Phone.can('number'), 'can Phone.number';
@@ -18,7 +17,7 @@ subtest 'number, area-code and pretty methods', {
   ok Phone.can('pretty'), 'can Phone.pretty';
 } or fail 'Missing method(s).';
 
-for @(%tests<valid>) {
+for @(%cases<valid>) {
   my $phone = Phone.new(number => .<input>);
   my $msg = 'for ' ~ .<test>;
   is $phone.number, .<number>, "number $msg";
@@ -29,5 +28,59 @@ for @(%tests<valid>) {
 todo 'Optional Exception Tests' unless %*ENV<EXERCISM>; # Remove this line for invalid input tests
 subtest 'Throw exceptions for invalid input', {
   plan 5;
-  throws-like {Phone.new(number => .<input>)}, Exception, .<test> for @(%tests<invalid>);
+  throws-like {Phone.new(number => .<input>)}, Exception, .<test> for @(%cases<invalid>);
+}
+
+done-testing;
+
+INIT {
+  %cases := from-json ｢
+    {
+      "valid": [
+        {
+          "input": 1234567890,
+          "number": "1234567890",
+          "area-code": "123",
+          "pretty": "(123) 456-7890",
+          "test": "10 digit integer"
+        },
+        {
+          "input": "+1 (234) 555-6789",
+          "number": "2345556789",
+          "area-code": "234",
+          "pretty": "(234) 555-6789",
+          "test": "11 digit formatted number"
+        },
+        {
+          "input": "1.379.555.2468",
+          "number": "3795552468",
+          "area-code": "379",
+          "pretty": "(379) 555-2468",
+          "test": "11 digit number containing separators"
+        }
+      ],
+      "invalid": [
+        {
+          "input": "",
+          "test": "empty input"
+        },
+        {
+          "input": "13579",
+          "test": "5 digit number"
+        },
+        {
+          "input": "123456789011",
+          "test": "12 digit number"
+        },
+        {
+          "input": "+2 (468) 555-1379",
+          "test": "11 digit number not beginning with 1"
+        },
+        {
+          "input": "phone number",
+          "test": "not a number"
+        }
+      ]
+    }
+  ｣
 }