Rename resources_count to files_count

    * Update expected test results

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

plugins/scancode-consolidate-scan/src/plugin_consolidate/__init__.py

@@ -80,7 +80,7 @@ class Consolidation(object):
     core_holders = attr.ib(default=attr.Factory(list))
     other_license_expression = attr.ib(default=None)
     other_holders = attr.ib(default=attr.Factory(list))
-    resources_count = attr.ib(default=None)
+    files_count = attr.ib(default=None)
     resources = attr.ib(default=attr.Factory(list))
 
     def to_dict(self, **kwargs):
@@ -265,7 +265,7 @@ def get_consolidated_packages(codebase):
                 core_holders=sorted(set(package_holders)),
                 other_license_expression=simplified_discovered_license_expression,
                 other_holders=sorted(set(discovered_holders)),
-                resources_count=len(package_resources),
+                files_count=sum(1 for package_resource in package_resources if package_resource.is_file),
                 resources=package_resources,
             )
             yield ConsolidatedPackage(
@@ -381,7 +381,7 @@ def create_license_holders_consolidated_component(resource, codebase):
             c = Consolidation(
                 core_license_expression=license_expression,
                 core_holders=holders,
-                resources_count=len(component_resources),
+                files_count=sum(1 for component_resource in component_resources if component_resource.is_file),
                 resources=component_resources,
             )
             return ConsolidatedComponent(
@@ -434,7 +434,7 @@ def combine_license_holders_consolidated_components(components):
         c = Consolidation(
             core_license_expression=component_license_expression,
             core_holders=component_holders,
-            resources_count=len(component_resources),
+            files_count=sum(1 for component_resource in component_resources if component_resource.is_file),
             resources=component_resources,
         )
         yield ConsolidatedComponent(

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/clear-summary-expected.json

@@ -34,7 +34,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 4
+      "files_count": 3
     }
   ],
   "consolidated_packages": [],

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/component-package-expected.json

@@ -34,7 +34,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 4
+      "files_count": 3
     }
   ],
   "consolidated_packages": [
@@ -90,7 +90,7 @@
         "The Apache Software",
         "The Apache Software Foundation"
       ],
-      "resources_count": 4
+      "files_count": 3
     }
   ],
   "files": [

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/license-holder-rollup-expected.json

@@ -34,7 +34,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 2
+      "files_count": 1
     },
     {
       "type": "license-holders",
@@ -50,7 +50,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 2
+      "files_count": 1
     },
     {
       "type": "license-holders",
@@ -66,7 +66,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 3
+      "files_count": 1
     }
   ],
   "consolidated_packages": [],

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/multiple-same-holder-and-license-expected.json

@@ -35,7 +35,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 3
+      "files_count": 2
     }
   ],
   "consolidated_packages": [],

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json

@@ -71,7 +71,7 @@
         "The Apache Software",
         "The Apache Software Foundation"
       ],
-      "resources_count": 5
+      "files_count": 4
     }
   ],
   "files": [

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/package-fileset-expected.json

@@ -69,7 +69,7 @@
       "other_holders": [
         "The Apache Software Foundation"
       ],
-      "resources_count": 5
+      "files_count": 4
     }
   ],
   "files": [

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/package-manifest-expected.json

@@ -65,7 +65,7 @@
       "core_holders": [],
       "other_license_expression": "apache-2.0",
       "other_holders": [],
-      "resources_count": 2
+      "files_count": 1
     }
   ],
   "files": [

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/return-nested-local-majority-expected.json

@@ -34,7 +34,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 2
+      "files_count": 1
     },
     {
       "type": "license-holders",
@@ -50,7 +50,7 @@
       ],
       "other_license_expression": null,
       "other_holders": [],
-      "resources_count": 5
+      "files_count": 3
     }
   ],
   "consolidated_packages": [],