trackler 2.2.1.48 → 2.2.1.49

data/tracks/perl6/exercises/grade-school/grade-school.t

@@ -38,11 +38,6 @@ subtest 'Additional students', {
   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';
-
-done-testing;
-
 INIT {
-  if %*ENV<EXERCISM> {
-    $module = 'Example';
-  }
+  $module = 'Example' if %*ENV<EXERCISM>;
 }

data/tracks/perl6/exercises/grains/grains.t

@@ -7,9 +7,7 @@ use JSON::Fast;
 my Str:D $exercise := 'Grains';
 my Version:D $version = v1;
 my Str $module //= $exercise;
-INIT {
-  plan 13;
-}
+plan 13;
 
 use-ok $module or bail-out;
 require ::($module);
@@ -33,7 +31,18 @@ for @($c-data<cases>[0]<cases>) {
 }
 is total-grains, |$c-data<cases>[1]<expected description>;
 
-done-testing;
+unless %*ENV<EXERCISM> {
+  skip-rest 'exercism tests';
+  exit;
+}
+
+subtest 'canonical-data' => {
+  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
+    $dir.IO.resolve.basename
+  }/canonical-data.json".IO.resolve) ~~ :f ??
+    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
+    flunk 'problem-specifications file not found';
+}
 
 INIT {
 $c-data := from-json q:to/END/;
@@ -43,7 +52,7 @@ $c-data := from-json q:to/END/;
   "version": "1.0.0",
   "comments": [
     "The final tests of square test error conditions",
-    "The expection for these tests is -1, indicating an error",
+    "The expectation for these tests is -1, indicating an error",
     "In these cases you should expect an error as is idiomatic for your language"
   ],
   "cases": [
@@ -122,19 +131,5 @@ $c-data := from-json q:to/END/;
 
 END
 
-  if %*ENV<EXERCISM> {
-    $module = 'Example';
-    if (my $c-data-file =
-      "$dir/../../problem-specifications/exercises/{$dir.IO.resolve.basename}/canonical-data.json"
-      .IO.resolve) ~~ :f
-    {
-      is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'canonical-data';
-    }
-    else {
-      flunk 'canonical-data';
-    }
-  }
-  else {
-    skip;
-  }
+  $module = 'Example' if %*ENV<EXERCISM>;
 }

data/tracks/perl6/exercises/hello-world/example.yaml

@@ -15,9 +15,7 @@ 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!"
 imports_comment: Import '&hello' from 'HelloWorld'
-exercism_comment: "Don't worry about the stuff in here for your exercise.\nThis is for Exercism folks to check that everything is in order."
-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!)"
+exercism_comment: "Don't worry about the stuff below here for your exercise.\nThis is for Exercism folks to check that everything is in order."
 
 unit: module
 unit_comment: |

data/tracks/perl6/exercises/hello-world/hello-world.t

@@ -7,9 +7,7 @@ use JSON::Fast;
 my Str:D $exercise := 'HelloWorld'; #`[The name of this exercise.]
 my Version:D $version = v2; #`[The version we will be matching against the exercise.]
 my Str $module //= $exercise; #`[The name of the module file to be loaded.]
-INIT {
-  plan 3; #`[This is how many tests we expect to run.]
-}
+plan 3; #`[This is how many tests we expect to run.]
 
 #`[Check that the module can be use-d.]
 use-ok $module or bail-out;
@@ -32,10 +30,21 @@ my $c-data;
 and check that &hello gives us the correct response.]
 is hello, |.<expected description> for @($c-data<cases>);
 
-done-testing; #`[There are no more tests after this :)]
+#`[Don't worry about the stuff below here for your exercise.
+This is for Exercism folks to check that everything is in order.]
+unless %*ENV<EXERCISM> {
+  skip-rest 'exercism tests';
+  exit;
+}
+
+subtest 'canonical-data' => {
+  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
+    $dir.IO.resolve.basename
+  }/canonical-data.json".IO.resolve) ~~ :f ??
+    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
+    flunk 'problem-specifications file not found';
+}
 
-#`['INIT' is a phaser, it makes sure that the test data is available before everything else
-starts running (otherwise we'd have to shove the test data into the middle of the file!)]
 INIT {
 $c-data := from-json q:to/END/;
 
@@ -53,21 +62,5 @@ $c-data := from-json q:to/END/;
 
 END
 
-  if %*ENV<EXERCISM> {
-#`[Don't worry about the stuff in here for your exercise.
-This is for Exercism folks to check that everything is in order.]
-    $module = 'Example';
-    if (my $c-data-file =
-      "$dir/../../problem-specifications/exercises/{$dir.IO.resolve.basename}/canonical-data.json"
-      .IO.resolve) ~~ :f
-    {
-      is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'canonical-data';
-    }
-    else {
-      flunk 'canonical-data';
-    }
-  }
-  else {
-    skip;
-  }
+  $module = 'Example' if %*ENV<EXERCISM>;
 }

data/tracks/perl6/exercises/leap/leap.t

@@ -7,9 +7,7 @@ use JSON::Fast;
 my Str:D $exercise := 'Leap';
 my Version:D $version = v2;
 my Str $module //= $exercise;
-INIT {
-  plan 6;
-}
+plan 6;
 
 use-ok $module or bail-out;
 require ::($module);
@@ -26,7 +24,18 @@ require ::($module) <&is-leap-year>;
 my $c-data;
 is is-leap-year(.<input>), |.<expected description> for @($c-data<cases>);
 
-done-testing;
+unless %*ENV<EXERCISM> {
+  skip-rest 'exercism tests';
+  exit;
+}
+
+subtest 'canonical-data' => {
+  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
+    $dir.IO.resolve.basename
+  }/canonical-data.json".IO.resolve) ~~ :f ??
+    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
+    flunk 'problem-specifications file not found';
+}
 
 INIT {
 $c-data := from-json q:to/END/;
@@ -64,19 +73,5 @@ $c-data := from-json q:to/END/;
 
 END
 
-  if %*ENV<EXERCISM> {
-    $module = 'Example';
-    if (my $c-data-file =
-      "$dir/../../problem-specifications/exercises/{$dir.IO.resolve.basename}/canonical-data.json"
-      .IO.resolve) ~~ :f
-    {
-      is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'canonical-data';
-    }
-    else {
-      flunk 'canonical-data';
-    }
-  }
-  else {
-    skip;
-  }
+  $module = 'Example' if %*ENV<EXERCISM>;
 }

data/tracks/perl6/exercises/linked-list/example.yaml

@@ -5,7 +5,8 @@ modules:
   - use: JSON::Fast
 methods: 'push-list pop-list shift-list unshift-list'
 tests: |
-  for my @cases -> $case {
+  my $cases = from-json $=pod.pop.contents;
+  for $cases.values -> $case {
     subtest $case.<name>, sub {
       my $linkedlist = ::($exercise).new;
       for  |$case.<set> -> %set {
@@ -21,64 +22,63 @@ tests: |
       }
     }
   }
-after_done_testing: |
-  INIT {
-    @cases := from-json ｢
-      [
-        {
-          "set" : [
-            { "push" : 10 },
-            { "push" : 20 },
-            { "pop"  : 20 },
-            { "pop"  : 10 }
-          ],
-          "name" : "push_pop"
-        },
-        {
-          "set" : [
-            { "push" : 10  },
-            { "push" : 20  },
-            { "shift" : 10 },
-            { "shift" : 20 }
-          ],
-          "name" : "push_shift"
-        },
-        {
-          "set" : [
-            { "unshift" : 10 },
-            { "unshift" : 20 },
-            { "shift"   : 20 },
-            { "shift"   : 10 }
-          ],
-          "name" : "unshift_shift"
-        },
-        {
-          "set" : [
-            { "unshift" : 10 },
-            { "unshift" : 20 },
-            { "pop"     : 10 },
-            { "pop"     : 20 }
-          ],
-          "name" : "unshift_pop"
-        },
-        {
-          "set" : [
-            { "push"    : 10 },
-            { "push"    : 20 },
-            { "pop"     : 20 },
-            { "push"    : 30 },
-            { "shift"   : 10 },
-            { "unshift" : 40 },
-            { "push"    : 50 },
-            { "shift"   : 40 },
-            { "pop"     : 50 },
-            { "shift"   : 30 }
-          ],
-          "name" : "example"
-        }
-      ]
-    ｣
-  }
+  
+  =head2 Test Data
+  =begin code
+  [
+    {
+      "set" : [
+        { "push" : 10 },
+        { "push" : 20 },
+        { "pop"  : 20 },
+        { "pop"  : 10 }
+      ],
+      "name" : "push_pop"
+    },
+    {
+      "set" : [
+        { "push" : 10  },
+        { "push" : 20  },
+        { "shift" : 10 },
+        { "shift" : 20 }
+      ],
+      "name" : "push_shift"
+    },
+    {
+      "set" : [
+        { "unshift" : 10 },
+        { "unshift" : 20 },
+        { "shift"   : 20 },
+        { "shift"   : 10 }
+      ],
+      "name" : "unshift_shift"
+    },
+    {
+      "set" : [
+        { "unshift" : 10 },
+        { "unshift" : 20 },
+        { "pop"     : 10 },
+        { "pop"     : 20 }
+      ],
+      "name" : "unshift_pop"
+    },
+    {
+      "set" : [
+        { "push"    : 10 },
+        { "push"    : 20 },
+        { "pop"     : 20 },
+        { "push"    : 30 },
+        { "shift"   : 10 },
+        { "unshift" : 40 },
+        { "push"    : 50 },
+        { "shift"   : 40 },
+        { "pop"     : 50 },
+        { "shift"   : 30 }
+      ],
+      "name" : "example"
+    }
+  ]
+  =end code
 
 unit: class
 example: |

data/tracks/perl6/exercises/linked-list/linked-list.t

@@ -23,7 +23,8 @@ subtest 'Class methods', {
   ok ::($exercise).can($_), $_ for <push-list pop-list shift-list unshift-list>;
 }
 
-for my @cases -> $case {
+my $cases = from-json $=pod.pop.contents;
+for $cases.values -> $case {
   subtest $case.<name>, sub {
     my $linkedlist = ::($exercise).new;
     for  |$case.<set> -> %set {
@@ -40,68 +41,62 @@ for my @cases -> $case {
   }
 }
 
-done-testing;
-
-INIT {
-  @cases := from-json ｢
-    [
-      {
-        "set" : [
-          { "push" : 10 },
-          { "push" : 20 },
-          { "pop"  : 20 },
-          { "pop"  : 10 }
-        ],
-        "name" : "push_pop"
-      },
-      {
-        "set" : [
-          { "push" : 10  },
-          { "push" : 20  },
-          { "shift" : 10 },
-          { "shift" : 20 }
-        ],
-        "name" : "push_shift"
-      },
-      {
-        "set" : [
-          { "unshift" : 10 },
-          { "unshift" : 20 },
-          { "shift"   : 20 },
-          { "shift"   : 10 }
-        ],
-        "name" : "unshift_shift"
-      },
-      {
-        "set" : [
-          { "unshift" : 10 },
-          { "unshift" : 20 },
-          { "pop"     : 10 },
-          { "pop"     : 20 }
-        ],
-        "name" : "unshift_pop"
-      },
-      {
-        "set" : [
-          { "push"    : 10 },
-          { "push"    : 20 },
-          { "pop"     : 20 },
-          { "push"    : 30 },
-          { "shift"   : 10 },
-          { "unshift" : 40 },
-          { "push"    : 50 },
-          { "shift"   : 40 },
-          { "pop"     : 50 },
-          { "shift"   : 30 }
-        ],
-        "name" : "example"
-      }
-    ]
-  ｣
-}
-
-INIT {
-  if %*ENV<EXERCISM> {
-    $module = 'Example';
+=head2 Test Data
+=begin code
+[
+  {
+    "set" : [
+      { "push" : 10 },
+      { "push" : 20 },
+      { "pop"  : 20 },
+      { "pop"  : 10 }
+    ],
+    "name" : "push_pop"
+  },
+  {
+    "set" : [
+      { "push" : 10  },
+      { "push" : 20  },
+      { "shift" : 10 },
+      { "shift" : 20 }
+    ],
+    "name" : "push_shift"
+  },
+  {
+    "set" : [
+      { "unshift" : 10 },
+      { "unshift" : 20 },
+      { "shift"   : 20 },
+      { "shift"   : 10 }
+    ],
+    "name" : "unshift_shift"
+  },
+  {
+    "set" : [
+      { "unshift" : 10 },
+      { "unshift" : 20 },
+      { "pop"     : 10 },
+      { "pop"     : 20 }
+    ],
+    "name" : "unshift_pop"
+  },
+  {
+    "set" : [
+      { "push"    : 10 },
+      { "push"    : 20 },
+      { "pop"     : 20 },
+      { "push"    : 30 },
+      { "shift"   : 10 },
+      { "unshift" : 40 },
+      { "push"    : 50 },
+      { "shift"   : 40 },
+      { "pop"     : 50 },
+      { "shift"   : 30 }
+    ],
+    "name" : "example"
   }
+]
+=end code
+INIT {
+  $module = 'Example' if %*ENV<EXERCISM>;
 }