trackler 2.2.1.54 → 2.2.1.55

data/tracks/python/exercises/nth-prime/nth_prime.py

@@ -1,2 +1,2 @@
-def nth_prime():
+def nth_prime(positive_number):
     pass

data/tracks/python/exercises/rna-transcription/README.md

@@ -18,6 +18,9 @@ each nucleotide with its complement:
 * `T` -> `A`
 * `A` -> `U`
 
+Your function will need to be able to handle invalid inputs by raising a
+`ValueError` with a meaningful message.
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `exercism/python/<exerciseName>` directory.
@@ -31,5 +34,7 @@ please see the [help page](http://exercism.io/languages/python).
 
 Rosalind [http://rosalind.info/problems/rna](http://rosalind.info/problems/rna)
 
+Note that in this problem we are finding the complement, so we also swap for the complementary bases - unlike the Rosalind problem which is just swapping T for U.
+
 ## Submitting Incomplete Solutions
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/rna-transcription/example.py

@@ -13,6 +13,6 @@ DNA_TO_RNA = maketrans(DNA_CHARS, 'UCGA')
 def to_rna(dna_strand):
     valid_chars = set(DNA_CHARS)
     if any(char not in valid_chars for char in dna_strand):
-        return ''
+        raise ValueError("Input DNA strand contains invalid bases")
 
     return dna_strand.translate(DNA_TO_RNA)

data/tracks/python/exercises/rna-transcription/rna_transcription_test.py

@@ -20,16 +20,19 @@ class DNATests(unittest.TestCase):
         self.assertEqual(to_rna('A'), 'U')
 
     def test_transcribes_all_occurences(self):
-        self.assertMultiLineEqual(to_rna('ACGTGGTCTTAA'), 'UGCACCAGAAUU')
+        self.assertEqual(to_rna('ACGTGGTCTTAA'), 'UGCACCAGAAUU')
 
     def test_correctly_handles_single_invalid_input(self):
-        self.assertEqual(to_rna('U'), '')
+        with self.assertRaises(ValueError):
+            to_rna('U')
 
     def test_correctly_handles_completely_invalid_input(self):
-        self.assertMultiLineEqual(to_rna('XXX'), '')
+        with self.assertRaises(ValueError):
+            to_rna('XXX')
 
     def test_correctly_handles_partially_invalid_input(self):
-        self.assertMultiLineEqual(to_rna('ACGTXXXCTTAA'), '')
+        with self.assertRaises(ValueError):
+            to_rna('ACGTXXXCTTAA')
 
 
 if __name__ == '__main__':

data/tracks/python/exercises/robot-simulator/robot_simulator_test.py

@@ -3,6 +3,8 @@ import unittest
 from robot_simulator import Robot, NORTH, EAST, SOUTH, WEST
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.0.0
+
 class RobotTests(unittest.TestCase):
     def test_init(self):
         robot = Robot()
@@ -32,19 +34,19 @@ class RobotTests(unittest.TestCase):
         self.assertEqual(robot.coordinates, (0, 1))
         self.assertEqual(robot.bearing, NORTH)
 
-    def test_advance_positive_east(self):
-        robot = Robot(EAST, 0, 0)
-        robot.advance()
-        self.assertEqual(robot.coordinates, (1, 0))
-        self.assertEqual(robot.bearing, EAST)
-
     def test_advance_negative_south(self):
         robot = Robot(SOUTH, 0, 0)
         robot.advance()
         self.assertEqual(robot.coordinates, (0, -1))
         self.assertEqual(robot.bearing, SOUTH)
 
-    def test_advance_positive_west(self):
+    def test_advance_positive_east(self):
+        robot = Robot(EAST, 0, 0)
+        robot.advance()
+        self.assertEqual(robot.coordinates, (1, 0))
+        self.assertEqual(robot.bearing, EAST)
+
+    def test_advance_negative_west(self):
         robot = Robot(WEST, 0, 0)
         robot.advance()
         self.assertEqual(robot.coordinates, (-1, 0))

data/tracks/python/exercises/saddle-points/saddle_points_test.py

@@ -10,21 +10,31 @@ import unittest
 from saddle_points import saddle_points
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0
+
 class SaddlePointTest(unittest.TestCase):
     def test_one_saddle(self):
         inp = [[9, 8, 7], [5, 3, 2], [6, 6, 7]]
         self.assertEqual(saddle_points(inp), set([(1, 0)]))
 
+    def test_empty_matrix(self):
+        self.assertEqual(saddle_points([]), set())
+
     def test_no_saddle(self):
-        self.assertEqual(saddle_points([[2, 1], [1, 2]]), set())
+        inp = [[1, 2, 3], [3, 1, 2], [2, 3, 1]]
+        self.assertEqual(saddle_points(inp), set())
 
     def test_mult_saddle(self):
-        inp = [[5, 3, 5, 4], [6, 4, 7, 3], [5, 1, 5, 3]]
-        ans = set([(0, 0), (0, 2), (2, 0), (2, 2)])
+        inp = [[4, 5, 4], [3, 5, 5], [1, 5, 4]]
+        ans = set([(0, 1), (1, 1), (2, 1)])
         self.assertEqual(saddle_points(inp), ans)
 
-    def test_empty_matrix(self):
-        self.assertEqual(saddle_points([]), set())
+    def test_indentify_saddle_bottom_right_corner(self):
+        inp = [[8, 7, 9], [6, 7, 6], [3, 2, 5]]
+        ans = set([(2, 2)])
+        self.assertEqual(saddle_points(inp), ans)
+
+    # Additional tests for this track
 
     def test_irregular_matrix(self):
         inp = [[3, 2, 1], [0, 1], [2, 1, 0]]

data/tracks/python/exercises/simple-cipher/simple_cipher.py

@@ -1,5 +1,11 @@
 class Cipher(object):
-    def __init__(self):
+    def __init__(self, key=None):
+        pass
+
+    def encode(self, text):
+        pass
+
+    def decode(self, text):
         pass
 
 

data/tracks/python/exercises/word-count/example.py

@@ -1,8 +1,10 @@
+import re
+
 from collections import Counter
 
 
+WORDS = re.compile("[a-z0-9]+(['][a-z]+)?")
+
+
 def word_count(text):
-    def replace_nonalpha(char):
-        return char.lower() if char.isalnum() else ' '
-    text = ''.join(replace_nonalpha(c) for c in text)
-    return Counter(text.split())
+    return Counter(word.group(0) for word in WORDS.finditer(text.lower()))

data/tracks/python/exercises/word-count/word_count_test.py

@@ -7,66 +7,93 @@ class WordCountTests(unittest.TestCase):
 
     def test_count_one_word(self):
         self.assertEqual(
-            {'word': 1},
-            word_count('word')
+            word_count('word'),
+            {'word': 1}
         )
 
     def test_count_one_of_each(self):
         self.assertEqual(
-            {'one': 1, 'of': 1, 'each': 1},
-            word_count('one of each')
+            word_count('one of each'),
+            {'one': 1, 'of': 1, 'each': 1}
         )
 
     def test_count_multiple_occurences(self):
         self.assertEqual(
-            {'one': 1, 'fish': 4, 'two': 1, 'red': 1, 'blue': 1},
-            word_count('one fish two fish red fish blue fish')
+            word_count('one fish two fish red fish blue fish'),
+            {'one': 1, 'fish': 4, 'two': 1, 'red': 1, 'blue': 1}
+        )
+
+    def test_cramped_list(self):
+        self.assertEqual(
+            word_count('one,two,three'),
+            {'one': 1, 'two': 1, 'three': 1}
+        )
+
+    def test_expanded_list(self):
+        self.assertEqual(
+            word_count('one,\ntwo,\nthree'),
+            {'one': 1, 'two': 1, 'three': 1}
         )
 
     def test_ignores_punctuation(self):
         self.assertEqual(
-            {'car': 1, 'carpet': 1, 'as': 1, 'java': 1, 'javascript': 1},
-            word_count('car : carpet as java : javascript!!&@$%^&')
+            word_count('car : carpet as java : javascript!!&@$%^&'),
+            {'car': 1, 'carpet': 1, 'as': 1, 'java': 1, 'javascript': 1}
         )
 
     def test_include_numbers(self):
         self.assertEqual(
-            {'testing': 2, '1': 1, '2': 1},
-            word_count('testing 1 2 testing')
+            word_count('testing 1 2 testing'),
+            {'testing': 2, '1': 1, '2': 1}
         )
 
     def test_mixed_case(self):
         self.assertEqual(
-            [2, 3],
-            sorted(list(word_count('go Go GO Stop stop').values()))
+            word_count('go Go GO Stop stop'),
+            {'go': 3, 'stop': 2}
+        )
+
+    def test_apostrophes(self):
+        self.assertEqual(
+            word_count("First: don't laugh. Then: don't cry."),
+            {'first': 1, "don't": 2, 'laugh': 1, 'then': 1, 'cry': 1}
         )
 
+    def test_quotations(self):
+        self.assertEqual(
+            word_count("Joe can't tell between 'large' and large."),
+            {'joe': 1, "can't": 1, 'tell': 1, 'between': 1, 'large': 2,
+             'and': 1}
+        )
+
+    # Additional tests for this track
+
     def test_multiple_spaces(self):
         self.assertEqual(
-            {'wait': 1, 'for': 1, 'it': 1},
-            word_count('wait for       it')
+            word_count('wait for       it'),
+            {'wait': 1, 'for': 1, 'it': 1}
         )
 
     def test_newlines(self):
         self.assertEqual(
-            {'rah': 2, 'ah': 3, 'roma': 2, 'ma': 1, 'ga': 2, 'oh': 1, 'la': 2,
-             'want': 1, 'your': 1, 'bad': 1, 'romance': 1},
             word_count('rah rah ah ah ah\nroma roma ma\n'
-                       'ga ga oh la la\nwant your bad romance')
+                       'ga ga oh la la\nwant your bad romance'),
+            {'rah': 2, 'ah': 3, 'roma': 2, 'ma': 1, 'ga': 2, 'oh': 1, 'la': 2,
+             'want': 1, 'your': 1, 'bad': 1, 'romance': 1}
         )
 
     def test_tabs(self):
         self.assertEqual(
-            {'rah': 2, 'ah': 3, 'roma': 2, 'ma': 1, 'ga': 2, 'oh': 1, 'la': 2,
-             'want': 1, 'your': 1, 'bad': 1, 'romance': 1},
             word_count('rah rah ah ah ah\troma roma ma\tga ga oh la la\t'
-                       'want your bad romance')
+                       'want your bad romance'),
+            {'rah': 2, 'ah': 3, 'roma': 2, 'ma': 1, 'ga': 2, 'oh': 1, 'la': 2,
+             'want': 1, 'your': 1, 'bad': 1, 'romance': 1}
         )
 
     def test_non_alphanumeric(self):
         self.assertEqual(
-            {'hey': 1, 'my': 1, 'spacebar': 1, 'is': 1, 'broken': 1},
-            word_count('hey,my_spacebar_is_broken.')
+            word_count('hey,my_spacebar_is_broken.'),
+            {'hey': 1, 'my': 1, 'spacebar': 1, 'is': 1, 'broken': 1}
         )
 
 

data/tracks/python/exercises/word-search/word_search_test.py

@@ -3,8 +3,111 @@ import unittest
 from word_search import WordSearch, Point
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
+
 class WordSearchTests(unittest.TestCase):
 
+    def test_initial_game_grid(self):
+        puzzle = 'jefblpepre'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertIsNone(searchAnswer)
+
+    def test_left_to_right_word(self):
+        puzzle = 'clojurermt'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 0), Point(6, 0)))
+
+    def test_left_to_right_word_different_position(self):
+        puzzle = 'mtclojurer'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(2, 0), Point(8, 0)))
+
+    def test_different_left_to_right_word(self):
+        puzzle = 'coffeelplx'
+        searchAnswer = WordSearch(puzzle).search('coffee')
+        self.assertEqual(searchAnswer, (Point(0, 0), Point(5, 0)))
+
+    def test_different_left_to_right_word_different_position(self):
+        puzzle = 'xcoffeezlp'
+        searchAnswer = WordSearch(puzzle).search('coffee')
+        self.assertEqual(searchAnswer, (Point(1, 0), Point(6, 0)))
+
+    def test_left_to_right_word_two_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'tclojurerm\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(1, 1), Point(7, 1)))
+
+    def test_left_to_right_word_three_lines(self):
+        puzzle = ('camdcimgtc\n'
+                  'jefblpepre\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 2), Point(6, 2)))
+
+    def test_left_to_right_word_ten_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'screeaumgr\n'
+                  'alxhpburyi\n'
+                  'jalaycalmp\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 9), Point(6, 9)))
+
+    def test_left_to_right_word_ten_lines_different_position(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'screeaumgr\n'
+                  'alxhpburyi\n'
+                  'clojurermt\n'
+                  'jalaycalmp\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 8), Point(6, 8)))
+
+    def test_different_left_to_right_word_ten_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'fortranftw\n'
+                  'alxhpburyi\n'
+                  'clojurermt\n'
+                  'jalaycalmp\n')
+        searchAnswer = WordSearch(puzzle).search('fortran')
+        self.assertEqual(searchAnswer, (Point(0, 6), Point(6, 6)))
+
+    def test_multiple_words(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'fortranftw\n'
+                  'alxhpburyi\n'
+                  'jalaycalmp\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('fortran')
+        self.assertEqual(searchAnswer, (Point(0, 6), Point(6, 6)))
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 9), Point(6, 9)))
+
+    def test_single_word_right_to_left(self):
+        puzzle = 'rixilelhrs'
+        searchAnswer = WordSearch(puzzle).search('elixir')
+        self.assertEqual(searchAnswer, (Point(5, 0), Point(0, 0)))
+
     @classmethod
     def setUpClass(self):
         puzzle = ('jefblpepre\n'
@@ -19,13 +122,11 @@ class WordSearchTests(unittest.TestCase):
                   'clojurermt')
         self.example = WordSearch(puzzle)
 
-    def test_horizontal_words_left_to_right(self):
+    def test_horizontal_words_different_directions(self):
         self.assertEqual(
             self.example.search('clojure'),
             (Point(0, 9), Point(6, 9))
         )
-
-    def test_horizontal_words_right_to_left(self):
         self.assertEqual(
             self.example.search('elixir'),
             (Point(5, 4), Point(0, 4))
@@ -70,15 +171,6 @@ class WordSearchTests(unittest.TestCase):
     def test_words_that_are_not_in_the_puzzle(self):
         self.assertIsNone(self.example.search('haskell'))
 
-    def test_search_differently_sized_puzzles(self):
-        puzzle = ('qwertyuiopz\n'
-                  'luamsicrexe\n'
-                  'abcdefghijk')
-        self.assertEqual(
-            WordSearch(puzzle).search('exercism'),
-            (Point(10, 1), Point(3, 1))
-        )
-
 
 if __name__ == '__main__':
     unittest.main()

data/tracks/rust/.travis.yml

@@ -2,6 +2,8 @@
 language: rust
 script:
 - "./_test/check-exercises.sh"
+- "sh ./_test/ensure-lib-src-rs-exist.sh"
+- "sh ./_test/ensure-stubs-compile.sh"
 - "sh ./_test/count-ignores.sh"
 - "./bin/fetch-configlet"
 - "./bin/configlet lint ."

data/tracks/rust/README.md

@@ -82,6 +82,11 @@ Note that:
 
 - The stub file and test suite should use only the Rust core libraries. `Cargo.toml` should not list any external dependencies as we don't want to make the student assume required crates. If an `example.rs` uses external crates, include `Cargo-example.toml` so that `_tests/check-exercises.sh` can compile with these when testing.
 
+- Except in extraordinary circumstances, the stub file should compile under `cargo test --no-run`.
+  This allows us to check that the signatures in the stub file match the signatures expected by the tests.
+  Use `unimplemented!()` as the body of each function to achieve this.
+  If there is a justified reason why this is not possible, instead include a `.meta/ALLOWED_TO_NOT_COMPILE` containing the reason.
+
 - If porting an existing exercise from problem-specifications that has a `canonical-data.json` file, use the version in `canonical-data.json` for that exercise as your `Cargo.toml` version.  Otherwise, use "0.0.0".
 
 - An exercise may contain `.meta/hints.md`.  This is optional and will appear after the normal exercise

data/tracks/rust/_test/check-exercises.sh

@@ -32,12 +32,6 @@ for exercise in $files; do
     (
         cd $workdir
 
-        if [ ! -f src/lib.rs ]; then
-            # https://github.com/exercism/rust/pull/270
-            echo "$exercise is missing a src/lib.rs; please create one (an empty file is acceptable)"
-            exitcode=1
-        fi
-
         cp example.rs src/lib.rs
 
         # Overwrite empty Cargo.toml if an example specific file exists