Fixed #199

Missing version value will not treat as a warning instead of error.

Author: chinyeungli

about_code_tool/about.py

@@ -428,9 +428,14 @@ def validate_field_values_are_not_empty(self):
                 continue
 
             if field_name in MANDATORY_FIELDS:
-                err = Error(VALUE, field_name, None,
-                            'This mandatory field has no value.')
-                self.errors.append(err)
+                if field_name == 'version':
+                    err = Warn(VALUE, field_name, None,
+                           'This mandatory field has no value.')
+                    self.warnings.append(err)
+                else:
+                    err = Error(VALUE, field_name, None,
+                                'This mandatory field has no value.')
+                    self.errors.append(err)
             elif field_name in OPTIONAL_FIELDS:
                 err = Warn(VALUE, field_name, None,
                            'This optional field has no value.')
@@ -517,8 +522,12 @@ def validate_mandatory_fields_are_present(self):
         """
         for field_name in MANDATORY_FIELDS:
             if field_name not in self.validated_fields:
-                self.errors.append(Error(VALUE, field_name, None,
+                if field_name == 'version' :
+                    self.warnings.append(Error(VALUE, field_name, None,
                                          'Mandatory field missing'))
+                else:
+                    self.errors.append(Error(VALUE, field_name, None,
+                                             'Mandatory field missing'))
 
     def validate_known_optional_fields(self, field_name):
         """

about_code_tool/tests/test_about.py

@@ -365,20 +365,28 @@ def test_validate_about_resource_error_thrown_when_file_referenced_by_about_file
 
     def test_validate_mand_fields_name_and_version_and_about_resource_present(self):
         about_file = AboutFile(join(TESTDATA_DIR, 'parser_tests/missing_mand.ABOUT'))
-        expected_errors = [(VALUE, 'name'),
-                           (VALUE, 'version'), ]
-        self.assertEqual(2, len(about_file.errors))
+        expected_errors = [(VALUE, 'name'),]
+        expected_warnings = [(VALUE, 'version'),]
+        self.assertEqual(1, len(about_file.errors))
+        self.assertEqual(1, len(about_file.warnings))
         for i, w in enumerate(about_file.errors):
             self.assertEqual(expected_errors[i][0], w.code)
             self.assertEqual(expected_errors[i][1], w.field_name)
+        for i, w in enumerate(about_file.warnings):
+            self.assertEqual(expected_warnings[i][0], w.code)
+            self.assertEqual(expected_warnings[i][1], w.field_name)
 
         about_file = AboutFile(join(TESTDATA_DIR, 'parser_tests/missing_mand_values.ABOUT'))
-        expected_errors = [(VALUE, 'name'),
-                             (VALUE, 'version')]
-        self.assertEqual(2, len(about_file.errors))
+        expected_errors = [(VALUE, 'name'),]
+        expected_warnings = [(VALUE, 'version'),]
+        self.assertEqual(1, len(about_file.errors))
+        self.assertEqual(1, len(about_file.warnings))
         for i, w in enumerate(about_file.errors):
             self.assertEqual(expected_errors[i][0], w.code)
             self.assertEqual(expected_errors[i][1], w.field_name)
+        for i, w in enumerate(about_file.warnings):
+            self.assertEqual(expected_warnings[i][0], w.code)
+            self.assertEqual(expected_warnings[i][1], w.field_name)
 
     def test_validate_optional_file_field_value(self):
         about_file = AboutFile(join(TESTDATA_DIR, 'parser_tests/about_file_ref.c.ABOUT'))

about_code_tool/tests/test_genabout.py

@@ -574,7 +574,6 @@ def test_verify_files_existence_exist(self):
         result = gen.verify_files_existence(input_list=test_fields,
                                             project_dir=gen_location,
                                             file_in_project=False)
-        print(result)
         self.assertEqual(expected, result)
         self.assertFalse(gen.warnings, 'No warnings should be returned.')
         self.assertFalse(gen.errors, 'No errors should be returned.')

about_code_tool/tests/testdata/parser_tests/missing_mand.ABOUT

@@ -1,6 +1,4 @@
 download_url: http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz
 date: 2012-08-21
 license_spdx: Apache-2.0
-license_text_file: httpd.LICENSE
-copyright: Copyright 2012 The Apache Software Foundation.
-notice_file: httpd.NOTICE
+copyright: Copyright 2012 The Apache Software Foundation.

about_code_tool/tests/testdata/parser_tests/missing_mand_values.ABOUT

@@ -1,9 +1,6 @@
 name: 
-about_resource:
 download_url: http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz
 version: 
 date: 2012-08-21
 license_spdx: Apache-2.0
-license_text_file: httpd.LICENSE
-copyright: Copyright 2012 The Apache Software Foundation.
-notice_file: httpd.NOTICE
+copyright: Copyright 2012 The Apache Software Foundation.