Update test cases upto expectation

Signed-off-by: akugarg <akanksha.garg2k@gmail.com>

Author: akugarg

src/summarycode/plugin_consolidate.py

@@ -338,6 +338,9 @@ def get_holders_consolidated_components(codebase):
                 if license_expression:
                     child.extra_data['normalized_license_expression'] = license_expression
                     child.save(codebase)
+                if "unknown" in license_expression:
+                    child.extra_data['normalized_unknown_license_expression'] = license_expression
+                    child.save(codebase)
 
             if child.holders:
                 holders = process_holders(h['value'] for h in child.holders)
@@ -383,15 +386,19 @@ def create_consolidated_components(resource, codebase, holder_key):
     given resource and holder key
     """
     license_expressions = []
+    unknwown_expressions = []
     holder = None
     resources = []
     for r in resource.walk(codebase):
         for normalized_holder in r.extra_data.get('normalized_holders', []):
             if not (normalized_holder.key == holder_key):
                 continue
             normalized_license_expression = r.extra_data.get('normalized_license_expression')
+            normalized_unknown_license_expression = r.extra_data.get('normalized_unknown_license_expression')
             if normalized_license_expression:
                 license_expressions.append(normalized_license_expression)
+            if normalized_unknown_license_expression:
+                unknwown_expressions.append(normalized_unknown_license_expression)
             if not holder:
                 holder = normalized_holder
             resources.append(r)
@@ -404,6 +411,7 @@ def create_consolidated_components(resource, codebase, holder_key):
 
     c = Consolidation(
         core_license_expression=combine_expressions(license_expressions),
+        other_license_expression = combine_expressions(unknwown_expressions),
         core_holders=[holder],
         files_count=len([r for r in resources if r.is_file]),
         resources=resources,

tests/summarycode/data/plugin_consolidate/e2fsprogs-expected.json

@@ -676,7 +676,7 @@
       "core_holders": [
         "Free Software Foundation, Inc. Michel Robitaille"
       ],
-      "other_license_expression": null,
+      "other_license_expression": "free-unknown",
       "other_holders": [],
       "files_count": 1
     },
@@ -692,7 +692,7 @@
       "core_holders": [
         "Free Software Foundation, Inc."
       ],
-      "other_license_expression": null,
+      "other_license_expression": "(gpl-3.0-plus WITH autoconf-simple-exception AND free-unknown) AND (gpl-2.0-plus AND free-unknown) AND free-unknown",
       "other_holders": [],
       "files_count": 63
     },
@@ -1140,7 +1140,7 @@
       "core_holders": [
         "Theodore Ts'o"
       ],
-      "other_license_expression": null,
+      "other_license_expression": "free-unknown",
       "other_holders": [],
       "files_count": 272
     },

tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json

@@ -39,12 +39,12 @@
     {
       "type": "holders",
       "identifier": "corp_oracle_1",
-      "consolidated_license_expression": "apache-2.0  AND unknown-license-reference",
+      "consolidated_license_expression": "apache-2.0",
       "consolidated_holders": [
         "Oracle Corp."
       ],
       "consolidated_copyright": "Copyright (c) Oracle Corp.",
-      "core_license_expression": "unknown-license-reference AND apache-2.0",
+      "core_license_expression": "apache-2.0",
       "core_holders": [
         "Oracle Corp."
       ],

tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json

@@ -23,12 +23,12 @@
     {
       "type": "holders",
       "identifier": "apache_foundation_software_1",
-      "consolidated_license_expression": "apache-2.0  AND unknown-license-reference",
+      "consolidated_license_expression": "apache-2.0",
       "consolidated_holders": [
         "The Apache Software Foundation"
       ],
       "consolidated_copyright": "Copyright (c) The Apache Software Foundation",
-      "core_license_expression": "unknown-license-reference AND apache-2.0",
+      "core_license_expression": "apache-2.0",
       "core_holders": [
         "The Apache Software Foundation"
       ],

tests/summarycode/data/plugin_consolidate/zlib-expected.json

@@ -284,7 +284,7 @@
       "core_holders": [
         "Cosmin Truta"
       ],
-      "other_license_expression": null,
+      "other_license_expression": "unknown-license-reference",
       "other_holders": [],
       "files_count": 3
     },

tests/summarycode/data/score/file_coverage-expected.json

@@ -158,9 +158,11 @@
           }
         }
       ],
+      "unknown_licenses": [],
       "license_expressions": [
         "mit"
       ],
+      "unknown_license_expressions": [],
       "percentage_of_license_text": 1.83,
       "copyrights": [],
       "holders": [],
@@ -274,9 +276,11 @@
           }
         }
       ],
+      "unknown_licenses": [],
       "license_expressions": [
         "mit"
       ],
+      "unknown_license_expressions": [],
       "percentage_of_license_text": 33.33,
       "copyrights": [
         {