#492 - Update test and code enhancement

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/cmd.py

@@ -842,9 +842,9 @@ def get_error_messages(errors, quiet=False, verbose=False):
         msg = '{sevcode}: {message}'.format(**locals())
         if not quiet:
             if verbose:
-                messages .append(msg)
+                messages.append(msg)
             elif severity >= WARNING:
-                messages .append(msg)
+                messages.append(msg)
     return messages, severe_errors_count
 
 ######################################################################

src/attributecode/gen.py

@@ -391,5 +391,4 @@ def generate(location, base_dir, android=None, reference_dir=None, fetch_license
                 errors.append(Error(ERROR, msg))
             else:
                 about.dump_android_notice(path, notice_dict[path])
-
     return errors, abouts

src/attributecode/model.py

@@ -1337,14 +1337,23 @@ def collect_inventory(location):
     name_errors = util.check_file_names(about_locations)
     errors.extend(name_errors)
     abouts = []
+    custom_fields_list = []
     for about_loc in about_locations:
         about_file_path = util.get_relative_path(input_location, about_loc)
         about = About(about_loc, about_file_path)
         # Insert about_file_path reference to the error
         for severity, message in about.errors:
-            msg = (about_file_path + ": " + message)
-            errors.append(Error(severity, msg))
+            if 'is a custom field' in message:
+                field_name = message.replace('Field', '').replace('is a custom field.', '').strip()
+                if not field_name in custom_fields_list:
+                    custom_fields_list.append(field_name)
+            else:
+                msg = (about_file_path + ": " + message)
+                errors.append(Error(severity, msg))
         abouts.append(about)
+    if custom_fields_list:
+        custom_fields_err_msg = 'Field ' + str(custom_fields_list) + ' is a custom field.'
+        errors.append(Error(INFO, custom_fields_err_msg))
     return errors, abouts
 
 

tests/test_model.py

@@ -1031,8 +1031,7 @@ def test_collect_inventory_return_errors(self):
         err_msg1 = 'non-supported_date_format.ABOUT: Field about_resource: Path %s not found' % file_path1
         err_msg2 = 'supported_date_format.ABOUT: Field about_resource: Path %s not found' % file_path2
         expected_errors = [
-            Error(INFO, 'non-supported_date_format.ABOUT: Field date is a custom field.'),
-            Error(INFO, 'supported_date_format.ABOUT: Field date is a custom field.'),
+            Error(INFO, "Field ['date'] is a custom field."),
             Error(INFO, err_msg1),
             Error(INFO, err_msg2)]
         assert sorted(expected_errors) == sorted(errors)
@@ -1105,18 +1104,17 @@ def test_collect_inventory_with_license_expression(self):
     def test_collect_inventory_always_collects_custom_fieldsg(self):
         test_loc = get_test_loc('test_model/inventory/custom_fields.ABOUT')
         errors, abouts = model.collect_inventory(test_loc)
-        expected_msg1 = 'Field resource is a custom field'
-        assert len(errors) == 2
-        assert expected_msg1 in errors[0].message
-        # The not supported 'resource' value is collected
+        expected_msg = "Field ['resource', 'custom_mapping'] is a custom field."
+        assert len(errors) == 1
+        assert expected_msg in errors[0].message
+        # The value of the custom field: 'resource' is collected
         assert abouts[0].resource.value
 
     def test_collect_inventory_does_not_raise_error_and_maintains_order_on_custom_fields(self):
         test_loc = get_test_loc('test_model/inventory/custom_fields2.ABOUT')
         errors, abouts = model.collect_inventory(test_loc)
         expected_errors = [
-            Error(INFO, 'inventory/custom_fields2.ABOUT: Field resource is a custom field.'),
-            Error(INFO, 'inventory/custom_fields2.ABOUT: Field custom_mapping is a custom field.')
+            Error(INFO, "Field ['resource', 'custom_mapping'] is a custom field.")
         ]
         assert expected_errors == errors
         expected = [u'about_resource: .\nname: test\nresource: .\ncustom_mapping: test\n']