Improve attribution template validation tests

 * add more template tests for corner cases
 * add validation for all builtin templates

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/test_attrib.py

@@ -18,6 +18,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import os
 import unittest
 
 from testing_utils import get_test_loc
@@ -28,26 +29,57 @@
 
 class AttribTest(unittest.TestCase):
 
-    def test_check_template(self):
-        assert attrib.check_template('template_string') == None
-        assert attrib.check_template('{{template_string') == (1,
-          "unexpected end of template, expected 'end of print statement'.",)
-        with open(get_test_loc('attrib_gen/test.template')) as tmpl:
-            template = tmpl.read()
-        assert attrib.check_template(template) == None
+    def test_check_template_simple_valid_returns_None(self):
+        expected = None
+        assert expected == attrib.check_template('template_string')
 
-    def test_check_template_default_is_valid(self):
-        with open(attrib.default_template) as tmpl:
-            template = tmpl.read()
-        assert attrib.check_template(template) == None
+    def test_check_template_complex_valid_returns_None(self):
+        template = '''
+        {% for about in abouts -%}
+            {{ about.name.value }}: {{ about.version.value }}
+            {% for res in about.about_resource.value -%}
+                resource: {{ res }}
+            {% endfor -%}
+        {% endfor -%}'''
+        expected = None
+        assert expected == attrib.check_template(template)
+
+    def test_check_template_complex_invalid_returns_error(self):
+        template = '''
+        {% for about in abouts -%}
+            {{ about.name.value }}: {{ about.version.value }}
+            {% for res in about.about_ressdsdsdsdsdsdource.value -%}
+                resource: {{] res }}
+            {% endfor -%}
+        {% endfor -%}'''
+        expected = (5, "unexpected ']'")
+        assert expected == attrib.check_template(template)
+
+    def test_check_template_invalid_return_error_lineno_and_message(self):
+        expected = 1, "unexpected end of template, expected 'end of print statement'."
+        assert expected == attrib.check_template('{{template_string')
+
+    def test_check_template_all_builtin_templates_are_valid(self):
+        builtin_templates_dir = os.path.dirname(attrib.default_template)
+        for template in os.listdir(builtin_templates_dir):
+            template = os.path.join(builtin_templates_dir, template)
+            with open(template) as tmpl:
+                template = tmpl.read()
+            assert None == attrib.check_template(template)
 
     def test_generate(self):
-        expected = (u'Apache HTTP Server: 2.4.3\n'
-                    u'resource: httpd-2.4.3.tar.gz\n')
         test_file = get_test_loc('attrib_gen/attrib.ABOUT')
+        errors, abouts = model.collect_inventory(test_file)
+
         with open(get_test_loc('attrib_gen/test.template')) as tmpl:
             template = tmpl.read()
-        _errors, abouts = model.collect_inventory(test_file)
+
+        assert not errors
+
+                expected = (
+            'Apache HTTP Server: 2.4.3\n'
+            'resource: httpd-2.4.3.tar.gz\n')
+
         result = attrib.generate(abouts, template)
         self.assertEqual(expected, result)