trackler 2.1.0.7 → 2.1.0.8

data/tracks/java/exercises/triangle/src/test/java/TriangleTest.java

@@ -11,7 +11,7 @@ public class TriangleTest {
     public final ExpectedException thrown = ExpectedException.none();
 
     @Test
-    public void equilateralTriangleHaveEqualSides() throws TriangleException {
+    public void equilateralTrianglesHaveEqualSides() throws TriangleException {
         Triangle triangle = new Triangle(2, 2, 2);
 
         assertEquals(TriangleKind.EQUILATERAL, triangle.getKind());

data/tracks/perl6/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: perl6
 perl6:
   - latest
-  - '2017.01' # Latest Rakudo Star
+  - '2017.04.3' # Latest Rakudo Star
 install:
   - rakudobrew build zef
   - zef install JSON::Tiny

data/tracks/perl6/exercises/bob/example.yaml

@@ -0,0 +1,19 @@
+exercise: Bob
+version: 1
+plan: 28
+methods: hey
+tests: |
+  #`[Go through all of the cases (hiding at the bottom of this file)
+  and check that Bob gives us the correct response for each one.]
+  is ::($exercise).?hey(.<input>), |.<expected description> for @($c-data<cases>);
+
+exercise_comment: The name of this exercise.
+module_comment: "%*ENV<EXERCISM> is for tests not directly for the exercise, don't worry about these :)"
+version_comment: The version we will be matching against the exercise.
+plan_comment: This is how many tests we expect to run.
+use_test_comment: Check that the module can be use-d.
+version_test_comment: "If the exercise is updated, we want to make sure other people testing\nyour code don't think you've made a mistake if things have changed!"
+methods_comment: "Check that the class 'Bob' can use all of the methods\nneeded in the tests (only 'hey' for this one)."
+cdata_test_comment: Ignore this for your exercise! Tells Exercism folks when exercise cases become out of date.
+done_testing_comment: There are no more tests after this :)
+INIT_comment: "'INIT' is a phaser, it makes sure that the test data is available before everything else\nstarts running (otherwise we'd have to shove the test data into the middle of the file!)"

data/tracks/perl6/exercises/clock/clock.t

@@ -25,14 +25,16 @@ subtest 'Class methods', {
 
 my $c-data;
 is ::($exercise).new(hour => .<hour>, minute => .<minute>).?time, |.<expected description> for @($c-data<cases>[0]<cases>);
-for @($c-data<cases>[1]<cases>) {
-  my $clock = ::($exercise).new(hour => .<hour>, minute => .<minute>);
-  $clock.?add-minutes(.<add>);
-  is $clock.?time, |.<expected description>;
+for @($c-data<cases>[1,2]) {
+  for @(.<cases>) {
+    my $clock = ::($exercise).new(hour => .<hour>, minute => .<minute>);
+    $clock.?add-minutes(.<add>);
+    is $clock.?time, |.<expected description>;
+  }
 }
 is ::($exercise).new(hour => .<clock1><hour>, minute => .<clock1><minute>).?time eq
    ::($exercise).new(hour => .<clock2><hour>, minute => .<clock2><minute>).?time,
-   |.<expected description> for @($c-data<cases>[2]<cases>);
+   |.<expected description> for @($c-data<cases>[3]<cases>);
 todo 'optional test' unless %*ENV<EXERCISM>;
 is ::($exercise).new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
 
@@ -47,7 +49,7 @@ $c-data := from-json q:to/END/;
 
 {
   "exercise": "clock",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "comments": [
     "Most languages require constructing a clock with initial values,",
     "adding a positive or negative number of minutes, and testing equality",
@@ -57,7 +59,7 @@ $c-data := from-json q:to/END/;
   ],
   "cases": [
     {
-      "description": "Test creating a new clock with an initial time.",
+      "description": "Create a new clock with an initial time",
       "cases": [
         {
           "description": "on the hour",
@@ -195,7 +197,7 @@ $c-data := from-json q:to/END/;
       ]
     },
     {
-      "description": "Test adding and subtracting minutes.",
+      "description": "Add minutes",
       "cases": [
         {
           "description": "add minutes",
@@ -260,7 +262,12 @@ $c-data := from-json q:to/END/;
           "minute": 1,
           "add": 3500,
           "expected": "11:21"
-        },
+        }
+      ]
+    },
+    {
+      "description": "Subtract minutes",
+      "cases": [
         {
           "description": "subtract minutes",
           "property": "add",
@@ -328,7 +335,7 @@ $c-data := from-json q:to/END/;
       ]
     },
     {
-      "description": "Construct two separate clocks, set times, test if they are equal.",
+      "description": "Compare two clocks for equality",
       "cases": [
         {
           "description": "clocks with same time",

data/tracks/perl6/exercises/clock/example.yaml

@@ -4,13 +4,15 @@ methods: time add-minutes
 plan: 54
 tests: |
   is ::($exercise).new(hour => .<hour>, minute => .<minute>).?time, |.<expected description> for @($c-data<cases>[0]<cases>);
-  for @($c-data<cases>[1]<cases>) {
-    my $clock = ::($exercise).new(hour => .<hour>, minute => .<minute>);
-    $clock.?add-minutes(.<add>);
-    is $clock.?time, |.<expected description>;
+  for @($c-data<cases>[1,2]) {
+    for @(.<cases>) {
+      my $clock = ::($exercise).new(hour => .<hour>, minute => .<minute>);
+      $clock.?add-minutes(.<add>);
+      is $clock.?time, |.<expected description>;
+    }
   }
   is ::($exercise).new(hour => .<clock1><hour>, minute => .<clock1><minute>).?time eq
      ::($exercise).new(hour => .<clock2><hour>, minute => .<clock2><minute>).?time,
-     |.<expected description> for @($c-data<cases>[2]<cases>);
+     |.<expected description> for @($c-data<cases>[3]<cases>);
   todo 'optional test' unless %*ENV<EXERCISM>;
   is ::($exercise).new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';

data/tracks/perl6/exercises/grade-school/example.yaml

@@ -0,0 +1,23 @@
+exercise: GradeSchool
+version: 1
+plan: 10
+imports: Roster
+tests: |
+  subtest "Roster class methods", {
+    plan 3;
+    ok ::('Roster').can($_), $_ for <add-student list-grade list-all>;
+  }
+  my $roster = ::('Roster').new;
+  ok $roster.?add-student(:name('Jim'), :2grade), 'Add Jim to grade 2';
+  is $roster.?list-grade(2), <Jim>, 'List grade 2';
+  ok $roster.?add-student(:name('Zoe'), :2grade), 'Add Zoe to grade 2';
+  ok $roster.?add-student(:name('Barb'), :1grade), 'Add Barb to grade 1';
+  is $roster.?list-grade(2), <Jim Zoe>, 'List grade 2';
+  is $roster.?list-grade(1), <Barb>, 'List grade 1';
+  subtest 'Additional students', {
+    plan 6;
+    ok $roster.?add-student(:name($_), :1grade), "Add $_ to grade 1" for <Charlie Anna>;
+    ok $roster.?add-student(:name('Alex'), :2grade), 'Add Alex to grade 2';
+    ok $roster.?add-student(:name($_), :3grade), "Add $_ to grade 3" for <Tom Dick Harry>;
+  }
+  is $roster.?list-all, ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';

data/tracks/perl6/exercises/leap/example.yaml

@@ -0,0 +1,6 @@
+exercise: Leap
+version: 1
+plan: 6
+imports: '&is-leap-year'
+tests: |
+  is &::('is-leap-year')(.<input>), |.<expected description> for @($c-data<cases>);

data/tracks/perl6/exercises/phone-number/Example.pm

@@ -1,6 +1,6 @@
-unit module Phone:ver<1>;
+unit module Phone:ver<2>;
 
 sub clean-number ($number is copy) is export {
   $number ~~ /<:L>/ ?? return Nil !! $number ~~ s:g/<:!Nd>//;
-  $number ~~ /^ 1? (<:Nd> ** 10) $/ ?? ~$0 !! Nil;
+  $number ~~ /^ 1? ( [ <[2..9]> <:Nd> ** 2 ] ** 2 <:Nd> ** 4 ) $/ ?? ~$0 !! Nil;
 }

data/tracks/perl6/exercises/phone-number/PhoneNumber.pm6

@@ -1,4 +1,4 @@
-unit module Phone:ver<1>;
+unit module Phone:ver<2>;
 
 sub clean-number ($number) is export {
 }

data/tracks/perl6/exercises/phone-number/example.yaml

@@ -0,0 +1,12 @@
+exercise: Phone
+version: 2
+plan: 15
+imports: '&clean-number'
+tests: |
+  for @($c-data<cases>[0]<cases>) {
+    if .<expected> {
+      is clean-number(.<phrase>), |.<expected description>;
+    } else {
+      nok clean-number(.<phrase>), .<description>;
+    }
+  }

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

@@ -5,9 +5,9 @@ use lib my $dir = $?FILE.IO.dirname;
 use JSON::Tiny;
 
 my $exercise = 'Phone';
-my $version = v1;
+my $version = v2;
 my $module = %*ENV<EXERCISM> ?? 'Example' !! $exercise;
-plan 13;
+plan 15;
 
 use-ok $module or bail-out;
 require ::($module);
@@ -19,15 +19,10 @@ if ::($exercise).^ver !~~ $version {
   bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
 }
 
-my @subs;
-BEGIN { @subs = <&clean-number> };
-subtest 'Subroutine(s)', {
-  plan 1;
-  eval-lives-ok "use $module; ::('$_').defined or die '$_ is not defined.'", $_ for @subs;
-} or bail-out 'All subroutines must be defined and exported.';
-require ::($module) @subs.eager;
+require ::($module) <&clean-number>;
 
-for @(my $c-data.<cases>.[0].<cases>) {
+my $c-data;
+for @($c-data<cases>[0]<cases>) {
   if .<expected> {
     is clean-number(.<phrase>), |.<expected description>;
   } else {
@@ -35,89 +30,109 @@ for @(my $c-data.<cases>.[0].<cases>) {
   }
 }
 
-if %*ENV<EXERCISM> && (my $c-data-file = "$dir/../../x-common/exercises/{$dir.IO.basename}/canonical-data.json".IO.resolve) ~~ :f {
-  is-deeply $c-data, from-json($c-data-file.slurp), 'canonical-data'
-} else { skip }
+if %*ENV<EXERCISM> && (my $c-data-file =
+  "$dir/../../x-common/exercises/{$dir.IO.resolve.basename}/canonical-data.json".IO.resolve) ~~ :f
+{ is-deeply $c-data, from-json($c-data-file.slurp), 'canonical-data' } else { skip }
 
 done-testing;
 
 INIT {
-  $c-data := from-json ｢
+$c-data := from-json q:to/END/;
+
+{
+  "exercise": "phone-number",
+  "version": "1.1.0",
+  "cases": [
     {
-      "exercise": "phone-number",
-      "version": "1.0.2",
+      "description": "Cleanup user-entered phone numbers",
+      "comments": [
+        " Returns the cleaned phone number if given number is valid, "
+      , " else returns nil. Note that number is not formatted,       "
+      , " just a 10-digit number is returned.                        "
+      ],
       "cases": [
         {
-          "description": "Cleanup user-entered phone numbers",
-          "comments": [
-            " Returns the cleaned phone number if given number is valid, "
-          , " else returns nil. Note that number is not formatted,       "
-          , " just a 10-digit number is returned.                        "
-          ],
-          "cases": [
-            {
-              "description": "cleans the number",
-              "property": "clean",
-              "phrase": "(123) 456-7890",
-              "expected": "1234567890"
-            },
-            {
-              "description": "cleans numbers with dots",
-              "property": "clean",
-              "phrase": "123.456.7890",
-              "expected": "1234567890"
-            },
-            {
-              "description": "cleans numbers with multiple spaces",
-              "property": "clean",
-              "phrase": "123 456   7890   ",
-              "expected": "1234567890"
-            },
-            {
-              "description": "invalid when 9 digits",
-              "property": "clean",
-              "phrase": "123456789",
-              "expected": null
-            },
-            {
-              "description": "invalid when 11 digits does not start with a 1",
-              "property": "clean",
-              "phrase": "21234567890",
-              "expected": null
-            },
-            {
-              "description": "valid when 11 digits and starting with 1",
-              "property": "clean",
-              "phrase": "11234567890",
-              "expected": "1234567890"
-            },
-            {
-              "description": "invalid when more than 11 digits",
-              "property": "clean",
-              "phrase": "321234567890",
-              "expected": null
-            },
-            {
-              "description": "invalid with letters",
-              "property": "clean",
-              "phrase": "123-abc-7890",
-              "expected": null
-            },
-            {
-              "description": "invalid with punctuations",
-              "property": "clean",
-              "phrase": "123-@:!-7890",
-              "expected": null
-            },
-            {
-              "description": "invalid with right number of digits but letters mixed in",
-              "property": "clean",
-              "phrase": "1a2b3c4d5e6f7g8h9i0j",
-              "expected": null
-            }
-          ]
+          "description": "cleans the number",
+          "property": "clean",
+          "phrase": "(223) 456-7890",
+          "expected": "2234567890"
+        },
+        {
+          "description": "cleans numbers with dots",
+          "property": "clean",
+          "phrase": "223.456.7890",
+          "expected": "2234567890"
+        },
+        {
+          "description": "cleans numbers with multiple spaces",
+          "property": "clean",
+          "phrase": "223 456   7890   ",
+          "expected": "2234567890"
+        },
+        {
+          "description": "invalid when 9 digits",
+          "property": "clean",
+          "phrase": "123456789",
+          "expected": null
+        },
+        {
+          "description": "invalid when 11 digits does not start with a 1",
+          "property": "clean",
+          "phrase": "22234567890",
+          "expected": null
+        },
+        {
+          "description": "valid when 11 digits and starting with 1",
+          "property": "clean",
+          "phrase": "12234567890",
+          "expected": "2234567890"
+        },
+        {
+          "description": "valid when 11 digits and starting with 1 even with punctuation",
+          "property": "clean",
+          "phrase": "+1 (223) 456-7890",
+          "expected": "2234567890"
+        },
+        {
+          "description": "invalid when more than 11 digits",
+          "property": "clean",
+          "phrase": "321234567890",
+          "expected": null
+        },
+        {
+          "description": "invalid with letters",
+          "property": "clean",
+          "phrase": "123-abc-7890",
+          "expected": null
+        },
+        {
+          "description": "invalid with punctuations",
+          "property": "clean",
+          "phrase": "123-@:!-7890",
+          "expected": null
+        },
+        {
+          "description": "invalid with right number of digits but letters mixed in",
+          "property": "clean",
+          "phrase": "1a2b3c4d5e6f7g8h9i0j",
+          "expected": null
+        },
+        {
+          "description": "invalid if area code does not start with 2-9",
+          "property": "clean",
+          "phrase": "(123) 456-7890",
+          "expected": null
+        },
+        {
+          "description": "invalid if exchange code does not start with 2-9",
+          "property": "clean",
+          "phrase": "(223) 056-7890",
+          "expected": null
         }
       ]
     }
-  ｣
+  ]
+}
+
+END
 }

data/tracks/perl6/exercises/space-age/Example.pm

@@ -10,21 +10,19 @@ class Earth does Planet is export {
   my $.orbital-period = 31557600;
 }
 
-my package EXPORT::DEFAULT {
-  my %planets = (
-    :Mercury(0.2408467),
-    :Venus(0.61519726),
-    :Mars(1.8808158),
-    :Jupiter(11.862615),
-    :Saturn(29.447498),
-    :Uranus(84.016846),
-    :Neptune(164.79132),
-  );
-  for %planets.kv -> $planet, $relative {
-    OUR::{$planet} := EVAL 'class :: does Planet {
-      my $.orbital-period = calculate-orbital-period $relative
-    }';
-  }
+my %planets = (
+  :Mercury(0.2408467),
+  :Venus(0.61519726),
+  :Mars(1.8808158),
+  :Jupiter(11.862615),
+  :Saturn(29.447498),
+  :Uranus(84.016846),
+  :Neptune(164.79132),
+);
+for %planets.kv -> $planet, $relative {
+  use MONKEY-SEE-NO-EVAL;
+  OUR::EXPORT::ALL::{$planet} := OUR::EXPORT::DEFAULT::{$planet} := EVAL "class $planet does Planet is export " ~
+  '{ my $.orbital-period = calculate-orbital-period $relative }';
 }
 
 sub calculate-orbital-period ($relative-to-earth) {