Fixed Template Error, regenerated tests for Flattened Problem Specs

exercises/practice/acronym/.meta/template.j2

@@ -10,9 +10,7 @@
 {{ macros.header()}}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases %}{% for case in supercase["cases"] -%}
+    {% for case in cases %}
     {{ test_case(case) }}
-    {% endfor %}{% endfor %}
-
-
+    {% endfor %}
 {{ macros.footer() }}

exercises/practice/alphametics/.meta/template.j2

@@ -2,7 +2,7 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for case in cases[0]["cases"] -%}
+    {% for case in cases -%}
     {% set description = case["description"] | to_snake -%}
     {% set testdef = "def test_" ~ description ~ "(self):" -%}
     {% set value = case["input"]["puzzle"] -%}
@@ -30,4 +30,4 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
         {% endif %}
     {% endfor %}
 
-{{ macros.footer() }}
+{{ macros.footer()}}

exercises/practice/book-store/.meta/template.j2

@@ -8,11 +8,9 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for casegroup in cases %}
-    {% for case in casegroup["cases"] -%}
+    {% for case in cases %}
     {{ test_case(case) }}
     {% endfor %}
-    {% endfor %}
 
     {% if additional_cases | length -%}
 

exercises/practice/etl/.meta/template.j2

@@ -12,9 +12,9 @@
 {{ macros.header()}}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases %}{% for case in supercase["cases"] -%}
+    {% for case in cases %}
     {{ test_case(case) }}
-    {% endfor %}{% endfor %}
+    {% endfor %}
 
 
 {{ macros.footer() }}

exercises/practice/food-chain/.meta/template.j2

@@ -2,15 +2,13 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases %}
-        {% for case in supercase["cases"] -%}
+    {% for case in cases %}
         def test_{{ case["description"] | to_snake }}(self):
             {%- set start_verse = case["input"]["startVerse"] %}
             {%- set end_verse = case["input"]["endVerse"] %}
             {%- set expected = case["expected"] %}
             self.assertEqual({{ case["property"]}}({{start_verse}}, {{end_verse}}), {{expected}})
 
         {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}

exercises/practice/gigasecond/.meta/template.j2

@@ -3,13 +3,12 @@ from datetime import datetime
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases -%}
-    {% for case in supercase["cases"] -%}
+    {% for case in cases -%}
     {% set input = case["input"]["moment"] | parse_datetime(strip_module=true) -%}
     {% set expected = case["expected"] | parse_datetime(strip_module=true) -%}
     def test_{{ case["description"] | to_snake }}(self):
         self.assertEqual({{ case["property"] }}({{ input }}), {{ expected }})
     {% endfor %}
-    {% endfor %}
+
 
 {{ macros.footer() }}

exercises/practice/house/.meta/template.j2

@@ -2,15 +2,13 @@
 {{ macros.header()}}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for casegroup in cases -%}
-    {% for case in casegroup["cases"] -%}
+    {% for case in cases -%}
     {%- set input = case["input"] -%}
     def test_{{ case["description"] | to_snake }}(self):
         self.assertEqual(
             {{ case["property"] | to_snake }}({{ input["startVerse"] }}, {{ input["endVerse"] }}),
             {{ case["expected"] }}
         )
     {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}

exercises/practice/isogram/.meta/template.j2

@@ -10,12 +10,12 @@
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
     {# All test cases in this exercise are nested, so use two for loops -#}
-    {% for case in cases -%}{% for case in case["cases"] -%}
+    {% for case in cases -%}
     def test_{{ case["description"] | to_snake }}(self):
         self.assertIs(
             {{- test_call(case) }},
             {{ case["expected"] }}
         )
-    {% endfor %}{% endfor %}
+    {% endfor %}
 
-{{ macros.footer() }}
+{{ macros.footer() }}

exercises/practice/ocr-numbers/.meta/template.j2

@@ -2,7 +2,7 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for case in cases[0]["cases"] -%}
+    {% for case in cases -%}
     def test_{{ case["description"] | to_snake }}(self):
         {% set candidate = case["input"]["rows"] -%}
         {% set output = case["expected"] -%}

exercises/practice/phone-number/.meta/template.j2

@@ -3,7 +3,7 @@
 {{ macros.header([class]) }}
 
 class {{ class }}Test(unittest.TestCase):
-    {% for case in cases[0]["cases"] -%}
+    {% for case in cases -%}
     def test_{{ case["description"] | to_snake }}(self):
         {% if "error" in case["expected"] -%}
         with self.assertRaisesWithMessage(ValueError):

exercises/practice/prime-factors/.meta/template.j2

@@ -2,11 +2,9 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases %}
-        {% for case in supercase["cases"] -%}
+    {% for case in cases %}
         def test_{{ case["description"] | to_snake }}(self):
             self.assertEqual({{ case["property"] }}({{ case["input"]["value"] }}), {{ case["expected"] }})
         {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}

exercises/practice/protein-translation/.meta/template.j2

@@ -2,14 +2,12 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for sub_cases in cases -%}
-    {% for case in sub_cases.cases -%}
+    {% for case in cases -%}
     def test_{{ case["description"] | to_snake }}(self):
         value = "{{ case["input"]["strand"] }}"
         expected = {{ case["expected"] }}
         self.assertEqual({{ case["property"] }}(value), expected)
 
     {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}

exercises/practice/rational-numbers/.meta/template.j2

@@ -94,4 +94,4 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
             {{ render_other_cases(mathtypescases) }}
         {% endif %}
     {% endfor %}
-{{ macros.footer() }}
+{{ macros.footer(True) }}

exercises/practice/rational-numbers/rational_numbers_test.py

@@ -146,6 +146,10 @@ def test_reduce_an_integer_to_lowest_terms(self):
     def test_reduce_one_to_lowest_terms(self):
         self.assertEqual(Rational(13, 13), Rational(1, 1))
 
+    # Utility functions
+    def assertRaisesWithMessage(self, exception):
+        return self.assertRaisesRegex(exception, r".+")
+
 
 if __name__ == "__main__":
     unittest.main()

exercises/practice/robot-simulator/.meta/template.j2

@@ -25,4 +25,4 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
     {% endfor %}{% endfor %}
 
 
-{{ macros.footer() }}
+{{ macros.footer(True) }}

exercises/practice/robot-simulator/robot_simulator_test.py

@@ -142,6 +142,10 @@ def test_moving_east_and_north(self):
         self.assertEqual(robot.coordinates, (11, 5))
         self.assertEqual(robot.direction, NORTH)
 
+    # Utility functions
+    def assertRaisesWithMessage(self, exception):
+        return self.assertRaisesRegex(exception, r".+")
+
 
 if __name__ == "__main__":
     unittest.main()

exercises/practice/roman-numerals/.meta/template.j2

@@ -6,4 +6,4 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
         self.assertEqual({{ case["property"] }}({{ case["input"]["number"] }}), "{{ case["expected"] }}")
     {% endfor %}
 
-{{ macros.footer() }}
+{{ macros.footer(True) }}

exercises/practice/roman-numerals/roman_numerals_test.py

@@ -63,6 +63,10 @@ def test_1024_is_mxxiv(self):
     def test_3000_is_mmm(self):
         self.assertEqual(roman(3000), "MMM")
 
+    # Utility functions
+    def assertRaisesWithMessage(self, exception):
+        return self.assertRaisesRegex(exception, r".+")
+
 
 if __name__ == "__main__":
     unittest.main()

exercises/practice/rotational-cipher/.meta/template.j2

@@ -2,15 +2,13 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases %}
-        {% for case in supercase["cases"] -%}
+    {% for case in cases %}
         def test_{{ case["description"] | to_snake }}(self):
             {%- set text = case["input"]["text"] %}
             {%- set shiftKey = case["input"]["shiftKey"] %}
             {%- set expected = case["expected"] %}
             self.assertEqual({{ case["property"] }}("{{ text }}", {{ shiftKey }}), "{{ expected }}")
 
         {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}

exercises/practice/run-length-encoding/.meta/template.j2

@@ -33,4 +33,4 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
     {% endfor %}
 
 
-{{ macros.footer() }}
+{{ macros.footer(True) }}

exercises/practice/run-length-encoding/run_length_encoding_test.py

@@ -54,6 +54,10 @@ def test_decode_lowercase_string(self):
     def test_encode_followed_by_decode_gives_original_string(self):
         self.assertMultiLineEqual(decode(encode("zzz ZZ  zZ")), "zzz ZZ  zZ")
 
+    # Utility functions
+    def assertRaisesWithMessage(self, exception):
+        return self.assertRaisesRegex(exception, r".+")
+
 
 if __name__ == "__main__":
     unittest.main()

exercises/practice/secret-handshake/.meta/template.j2

@@ -2,11 +2,9 @@
 {{ macros.header() }}
 
 class {{ exercise | camel_case }}Test(unittest.TestCase):
-    {% for supercase in cases -%}
-    {% for case in supercase["cases"] -%}
+    {% for case in cases -%}
     def test_{{ case["description"] | to_snake }}(self):
         self.assertEqual({{ case["property"] }}("{{ plugins.to_binary(case["input"]["number"]) }}"), {{ case["expected"] }})
     {% endfor %}
-    {% endfor %}
 
 {{ macros.footer() }}