tracks/perl6/exercises/phone-number/phone-number.t in trackler-2.2.1.43 vs tracks/perl6/exercises/phone-number/phone-number.t in trackler-2.2.1.44

- old
+ new

@@ -2,14 +2,16 @@ use v6; use Test; use lib my $dir = $?FILE.IO.dirname; use JSON::Fast; -my $exercise = 'Phone'; -my $version = v3; -my $module = %*ENV<EXERCISM> ?? 'Example' !! $exercise; -plan 14; +my Str:D $exercise := 'Phone'; +my Version:D $version = v3; +my Str $module //= $exercise; +INIT { + plan 14; +} use-ok $module or bail-out; require ::($module); if ::($exercise).^ver !~~ $version { @@ -28,16 +30,10 @@ } else { nok clean-number(.<phrase>), .<description>; } } -if %*ENV<EXERCISM> { - if (my $c-data-file = "$dir/../../problem-specifications/exercises/{$dir.IO.resolve.basename}/canonical-data.json".IO.resolve) ~~ :f { - is-deeply $c-data, EVAL('use JSON::Fast; from-json($c-data-file.slurp);'), 'canonical-data'; - } else { flunk 'canonical-data' } -} else { skip } - done-testing; INIT { $c-data := from-json q:to/END/; @@ -129,6 +125,22 @@ } ] } 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; + } }