trackler 2.1.0.11 → 2.1.0.12

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

@@ -0,0 +1,12 @@
+exercise: Wordy
+version: 1
+plan: 18
+imports: '&answer'
+tests: |
+  for @($c-data<cases>) {
+    if .<expected> === False {
+      throws-like {.<input>.&answer}, Exception, .<description>;
+    } else {
+      is .<input>.&answer, |.<expected description>;
+    }
+  }

data/tracks/perl6/exercises/wordy/wordy.t

@@ -7,7 +7,7 @@ use JSON::Tiny;
 my $exercise = 'Wordy';
 my $version = v1;
 my $module = %*ENV<EXERCISM> ?? 'Example' !! $exercise;
-plan 19;
+plan 18;
 
 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 = <&answer> };
-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) <&answer>;
 
-for @(my $c-data.<cases>) {
+my $c-data;
+for @($c-data<cases>) {
   if .<expected> === False {
     throws-like {.<input>.&answer}, Exception, .<description>;
   } else {
@@ -35,120 +30,122 @@ for @(my $c-data.<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 ｢
-    {
-      "exercise": "wordy",
-      "version": "1.0.0",
-      "comments": [
-        "The tests that expect 'false' should be implemented to raise",
-        "an error, or indicate a failure. Implement this in a way that",
-        "makes sense for your language."
-      ],
-      "cases": [
-        {
-          "description": "addition",
-          "property": "answer",
-          "input": "What is 1 plus 1?",
-          "expected": 2
-        },
-        {
-          "description": "more addition",
-          "property": "answer",
-          "input": "What is 53 plus 2?",
-          "expected": 55
-        },
-        {
-          "description": "addition with negative numbers",
-          "property": "answer",
-          "input": "What is -1 plus -10?",
-          "expected": -11
-        },
-        {
-          "description": "large addition",
-          "property": "answer",
-          "input": "What is 123 plus 45678?",
-          "expected": 45801
-        },
-        {
-          "description": "subtraction",
-          "property": "answer",
-          "input": "What is 4 minus -12?",
-          "expected": 16
-        },
-        {
-          "description": "multiplication",
-          "property": "answer",
-          "input": "What is -3 multiplied by 25?",
-          "expected": -75
-        },
-        {
-          "description": "division",
-          "property": "answer",
-          "input": "What is 33 divided by -3?",
-          "expected": -11
-        },
-        {
-          "description": "multiple additions",
-          "property": "answer",
-          "input": "What is 1 plus 1 plus 1?",
-          "expected": 3
-        },
-        {
-          "description": "addition and subtraction",
-          "property": "answer",
-          "input": "What is 1 plus 5 minus -2?",
-          "expected": 8
-        },
-        {
-          "description": "multiple subtraction",
-          "property": "answer",
-          "input": "What is 20 minus 4 minus 13?",
-          "expected": 3
-        },
-        {
-          "description": "subtraction then addition",
-          "property": "answer",
-          "input": "What is 17 minus 6 plus 3?",
-          "expected": 14
-        },
-        {
-          "description": "multiple multiplication",
-          "property": "answer",
-          "input": "What is 2 multiplied by -2 multiplied by 3?",
-          "expected": -12
-        },
-        {
-          "description": "addition and multiplication",
-          "property": "answer",
-          "input": "What is -3 plus 7 multiplied by -2?",
-          "expected": -8
-        },
-        {
-          "description": "multiple division",
-          "property": "answer",
-          "input": "What is -12 divided by 2 divided by -3?",
-          "expected": 2
-        },
-        {
-          "description": "unknown operation",
-          "property": "answer",
-          "input": "What is 52 cubed?",
-          "expected": false
-        },
-        {
-          "description": "Non math question",
-          "property": "answer",
-          "input": "Who is the President of the United States?",
-          "expected": false
-        }
-      ]
+$c-data := from-json q:to/END/;
+
+{
+  "exercise": "wordy",
+  "version": "1.0.0",
+  "comments": [
+    "The tests that expect 'false' should be implemented to raise",
+    "an error, or indicate a failure. Implement this in a way that",
+    "makes sense for your language."
+  ],
+  "cases": [
+    {
+      "description": "addition",
+      "property": "answer",
+      "input": "What is 1 plus 1?",
+      "expected": 2
+    },
+    {
+      "description": "more addition",
+      "property": "answer",
+      "input": "What is 53 plus 2?",
+      "expected": 55
+    },
+    {
+      "description": "addition with negative numbers",
+      "property": "answer",
+      "input": "What is -1 plus -10?",
+      "expected": -11
+    },
+    {
+      "description": "large addition",
+      "property": "answer",
+      "input": "What is 123 plus 45678?",
+      "expected": 45801
+    },
+    {
+      "description": "subtraction",
+      "property": "answer",
+      "input": "What is 4 minus -12?",
+      "expected": 16
+    },
+    {
+      "description": "multiplication",
+      "property": "answer",
+      "input": "What is -3 multiplied by 25?",
+      "expected": -75
+    },
+    {
+      "description": "division",
+      "property": "answer",
+      "input": "What is 33 divided by -3?",
+      "expected": -11
+    },
+    {
+      "description": "multiple additions",
+      "property": "answer",
+      "input": "What is 1 plus 1 plus 1?",
+      "expected": 3
+    },
+    {
+      "description": "addition and subtraction",
+      "property": "answer",
+      "input": "What is 1 plus 5 minus -2?",
+      "expected": 8
+    },
+    {
+      "description": "multiple subtraction",
+      "property": "answer",
+      "input": "What is 20 minus 4 minus 13?",
+      "expected": 3
+    },
+    {
+      "description": "subtraction then addition",
+      "property": "answer",
+      "input": "What is 17 minus 6 plus 3?",
+      "expected": 14
+    },
+    {
+      "description": "multiple multiplication",
+      "property": "answer",
+      "input": "What is 2 multiplied by -2 multiplied by 3?",
+      "expected": -12
+    },
+    {
+      "description": "addition and multiplication",
+      "property": "answer",
+      "input": "What is -3 plus 7 multiplied by -2?",
+      "expected": -8
+    },
+    {
+      "description": "multiple division",
+      "property": "answer",
+      "input": "What is -12 divided by 2 divided by -3?",
+      "expected": 2
+    },
+    {
+      "description": "unknown operation",
+      "property": "answer",
+      "input": "What is 52 cubed?",
+      "expected": false
+    },
+    {
+      "description": "Non math question",
+      "property": "answer",
+      "input": "Who is the President of the United States?",
+      "expected": false
     }
-  ｣
+  ]
+}
+
+END
 }

data/tracks/perl6/templates/test.mustache

@@ -41,7 +41,9 @@ if %*ENV<EXERCISM> && (my $c-data-file =
 { is-deeply $c-data, from-json($c-data-file.slurp), 'canonical-data' } else { skip }
 #`{{/cdata}}
 
-done-testing;#`{{#done_testing_comment}} #`[#`{{&done_testing_comment}}]#`{{/done_testing_comment}}#`{{#cdata}}
+done-testing;#`{{#done_testing_comment}} #`[#`{{&done_testing_comment}}]#`{{/done_testing_comment}}#`{{#after_done_testing}}
+
+#`{{&after_done_testing}}#`{{/after_done_testing}}#`{{#cdata}}
 #`{{#INIT_comment}}
 
 #`[#`{{&INIT_comment}}]#`{{/INIT_comment}}

data/tracks/php/config.json

@@ -372,6 +372,11 @@
       "slug": "perfect-numbers",
       "difficulty": 1,
       "topics": []
+  },
+  {
+      "slug": "sum-of-multiples",
+      "difficulty": 2,
+      "topics" : []
   }
   ]
 }

data/tracks/php/exercises/sum-of-multiples/example.php

@@ -0,0 +1,15 @@
+<?php
+
+function sumOfMultiples($number, $multiples)
+{
+    $numbers = [];
+    for ($i = 1; $i < $number; $i++) {
+        foreach ($multiples as $multiple) {
+            $testNumber = $multiple * $i;
+            if ($testNumber < $number) {
+                array_push($numbers, $testNumber);
+            }
+        }
+    }
+    return array_sum(array_unique($numbers));
+}

data/tracks/php/exercises/sum-of-multiples/sum-of-multiples_test.php

@@ -0,0 +1,64 @@
+<?php
+require "sum-of-multiples.php";
+
+class SumOfMultiplesTest extends PHPUnit\Framework\TestCase
+{
+    public function testSumToOne()
+    {
+        $this->assertEquals(0, sumOfMultiples(1, [3, 5]));
+    }
+
+    public function testSumToThree()
+    {
+        $this->assertEquals(3, sumOfMultiples(4, [3, 5]));
+    }
+
+    public function testSumToTen()
+    {
+        $this->assertEquals(23, sumOfMultiples(10, [3, 5]));
+    }
+
+    public function testSumToTwenty()
+    {
+        $this->assertEquals(78, sumOfMultiples(20, [3, 5]));
+    }
+
+    public function testSumToHundred()
+    {
+        $this->assertEquals(2318, sumOfMultiples(100, [3, 5]));
+    }
+
+    public function testSumToThousand()
+    {
+        $this->assertEquals(233168, sumOfMultiples(1000, [3, 5]));
+    }
+
+    public function testConfigureToTwenty()
+    {
+        $this->assertEquals(51, sumOfMultiples(20, [7, 13, 17]));
+    }
+
+    public function testConfigureToFifteen()
+    {
+        $this->assertEquals(30, sumOfMultiples(15, [4, 6]));
+    }
+
+    public function testConfigureToOneFifty()
+    {
+        $this->assertEquals(4419, sumOfMultiples(150, [5, 6, 8]));
+    }
+
+    public function testConfigureToFortySeven()
+    {
+        $this->assertEquals(2203160, sumOfMultiples(10000, [43, 47]));
+    }
+
+    public function testMultiplesOfOneToHundred()
+    {
+        $this->assertEquals(4950, sumOfMultiples(100, [1]));
+    }
+    public function testMultiplesOfEmptyList()
+    {
+        $this->assertEquals(0, sumOfMultiples(1000, [0]));
+    }
+}

data/tracks/python/exercises/book-store/book_store_test.py

@@ -3,7 +3,7 @@ import unittest
 from book_store import calculate_total
 
 
-# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.0
+# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.1
 
 class BookStoreTests(unittest.TestCase):
     def test_only_a_single_book(self):

data/tracks/python/exercises/rail-fence-cipher/rail_fence_cipher_test.py

@@ -3,30 +3,30 @@ import unittest
 from rail_fence_cipher import encode, decode
 
 
-# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.0
+# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.1
 
 class RailFenceTests(unittest.TestCase):
-    def test_to_encode_with_two_rails(self):
+    def test_encode_with_two_rails(self):
         self.assertMultiLineEqual(
             encode('XOXOXOXOXOXOXOXOXO', 2), 'XXXXXXXXXOOOOOOOOO')
 
-    def test_to_encode_with_three_rails(self):
+    def test_encode_with_three_rails(self):
         self.assertMultiLineEqual(
             encode('WEAREDISCOVEREDFLEEATONCE', 3),
             'WECRLTEERDSOEEFEAOCAIVDEN')
 
-    def test_to_encode_with_ending_in_the_middle(self):
+    def test_encode_with_ending_in_the_middle(self):
         self.assertMultiLineEqual(encode('EXERCISES', 4), 'ESXIEECSR')
 
-    def test_to_decode_with_three_rails(self):
+    def test_decode_with_three_rails(self):
         self.assertMultiLineEqual(
             decode('TEITELHDVLSNHDTISEIIEA', 3), 'THEDEVILISINTHEDETAILS')
 
-    def test_to_decode_with_five_rails(self):
+    def test_decode_with_five_rails(self):
         self.assertMultiLineEqual(
             decode('EIEXMSMESAORIWSCE', 5), 'EXERCISMISAWESOME')
 
-    def test_to_decode_with_six_rails(self):
+    def test_decode_with_six_rails(self):
         self.assertMultiLineEqual(
             decode(
                 '133714114238148966225439541018335470986172518171757571896261',

data/tracks/python/exercises/tournament/tournament_test.py

@@ -3,9 +3,69 @@ import unittest
 from tournament import tally
 
 
-# test cases adapted from `x-common//canonical-data.json` @ version: 1.1.0
+# test cases adapted from `x-common//canonical-data.json` @ version: 1.3.0
 
 class TestTournament(unittest.TestCase):
+    def test_just_the_header_if_no_input(self):
+        self.assertEqual(
+            tally(''),
+            'Team                           | MP |  W |  D |  L |  P'
+        )
+
+    def test_a_win_is_three_points_and_a_loss_is_zero_points(self):
+        results = 'Allegoric Alaskans;Blithering Badgers;win'
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  1 |  1 |  0 |  0 |  3\n'
+                 'Blithering Badgers             |  1 |  0 |  0 |  1 |  0')
+        self.assertEqual(tally(results), table)
+
+    def test_a_win_can_also_be_expressed_as_a_loss(self):
+        results = 'Blithering Badgers;Allegoric Alaskans;loss'
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  1 |  1 |  0 |  0 |  3\n'
+                 'Blithering Badgers             |  1 |  0 |  0 |  1 |  0')
+        self.assertEqual(tally(results), table)
+
+    def test_a_different_team_can_win(self):
+        results = 'Blithering Badgers;Allegoric Alaskans;win'
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Blithering Badgers             |  1 |  1 |  0 |  0 |  3\n'
+                 'Allegoric Alaskans             |  1 |  0 |  0 |  1 |  0')
+        self.assertEqual(tally(results), table)
+
+    def test_a_draw_is_one_point_each(self):
+        results = 'Allegoric Alaskans;Blithering Badgers;draw'
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  1 |  0 |  1 |  0 |  1\n'
+                 'Blithering Badgers             |  1 |  0 |  1 |  0 |  1')
+        self.assertEqual(tally(results), table)
+
+    def test_there_can_be_more_than_one_match(self):
+        results = ('Allegoric Alaskans;Blithering Badgers;win\n'
+                   'Allegoric Alaskans;Blithering Badgers;win')
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  2 |  2 |  0 |  0 |  6\n'
+                 'Blithering Badgers             |  2 |  0 |  0 |  2 |  0')
+        self.assertEqual(tally(results), table)
+
+    def test_there_can_be_more_than_one_winner(self):
+        results = ('Allegoric Alaskans;Blithering Badgers;loss\n'
+                   'Allegoric Alaskans;Blithering Badgers;win')
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  2 |  1 |  0 |  1 |  3\n'
+                 'Blithering Badgers             |  2 |  1 |  0 |  1 |  3')
+        self.assertEqual(tally(results), table)
+
+    def test_there_can_be_more_than_two_teams(self):
+        results = ('Allegoric Alaskans;Blithering Badgers;win\n'
+                   'Blithering Badgers;Courageous Californians;win\n'
+                   'Courageous Californians;Allegoric Alaskans;loss')
+        table = ('Team                           | MP |  W |  D |  L |  P\n'
+                 'Allegoric Alaskans             |  2 |  2 |  0 |  0 |  6\n'
+                 'Blithering Badgers             |  2 |  1 |  0 |  1 |  3\n'
+                 'Courageous Californians        |  2 |  0 |  0 |  2 |  0')
+        self.assertEqual(tally(results), table)
+
     def test_typical_input(self):
         results = ('Allegoric Alaskans;Blithering Badgers;win\n'
                    'Devastating Donkeys;Courageous Californians;draw\n'
@@ -22,7 +82,7 @@ class TestTournament(unittest.TestCase):
 
         self.assertEqual(tally(results), table)
 
-    def test_incomplete_competitionnot_all_pairs_have_played(self):
+    def test_incomplete_competitionnot_not_all_pairs_have_played(self):
         results = ('Allegoric Alaskans;Blithering Badgers;loss\n'
                    'Devastating Donkeys;Allegoric Alaskans;loss\n'
                    'Courageous Californians;Blithering Badgers;draw\n'
@@ -52,19 +112,6 @@ class TestTournament(unittest.TestCase):
 
         self.assertEqual(tally(results), table)
 
-    def test_mostly_invalid_lines(self):
-        results = ('\n'
-                   'Allegoric Alaskans@Blithering Badgers;draw\n'
-                   'Blithering Badgers;Devastating Donkeys;loss\n'
-                   'Devastating Donkeys;Courageous Californians;win;5\n'
-                   'Courageous Californians;Allegoric Alaskans;los')
-
-        table = ('Team                           | MP |  W |  D |  L |  P\n'
-                 'Devastating Donkeys            |  1 |  1 |  0 |  0 |  3\n'
-                 'Blithering Badgers             |  1 |  0 |  0 |  1 |  0')
-
-        self.assertEqual(tally(results), table)
-
 
 if __name__ == '__main__':
     unittest.main()