Update Failing tests with SCANCODE_REGEN_TEST_FIXTURES

Signed-off-by: swastik <swastkk@gmail.com>
aboutcode-org · Jun 10, 2024 · fa8fcfc · fa8fcfc
1 parent fdca15e
commit fa8fcfc
Show file tree

Hide file tree

Showing 301 changed files with 2,491 additions and 2,157 deletions.
diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json
@@ -84,6 +84,7 @@
       "datasource_ids": [
         "maven_pom"
       ],
+      "license_clarity": [],
       "purl": "pkg:maven/javax.persistence/persistence-api@1.0"
     },
     {
@@ -185,6 +186,7 @@
       "datasource_ids": [
         "npm_package_json"
       ],
+      "license_clarity": [],
       "purl": "pkg:npm/grunt-esvm@3.2.8"
     },
     {
@@ -262,6 +264,7 @@
       "datasource_ids": [
         "npm_package_json"
       ],
+      "license_clarity": [],
       "purl": "pkg:npm/angular-compare-validator@0.1.1"
     }
   ],

diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines
@@ -12,19 +12,19 @@
           "--package": true
         },
         "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-        "output_format_version": "3.0.0",
+        "output_format_version": "3.1.0",
         "message": null,
         "errors": [],
         "warnings": [],
         "extra_data": {
           "system_environment": {
-            "operating_system": "linux",
+            "operating_system": "mac",
             "cpu_architecture": "64",
-            "platform": "Linux-5.15.0-89-generic-x86_64-with-glibc2.29",
-            "platform_version": "#99~20.04.1-Ubuntu SMP Thu Nov 2 15:16:47 UTC 2023",
-            "python_version": "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]"
+            "platform": "macOS-14.5-x86_64-i386-64bit",
+            "platform_version": "Darwin Kernel Version 23.5.0: Wed May  1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103",
+            "python_version": "3.12.3 (main, Apr  9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)]"
           },
-          "spdx_license_list_version": "3.22",
+          "spdx_license_list_version": "3.23",
           "files_count": 4
         }
       }
@@ -116,6 +116,7 @@
         "datasource_ids": [
           "maven_pom"
         ],
+        "license_clarity": [],
         "purl": "pkg:maven/javax.persistence/persistence-api@1.0"
       },
       {
@@ -217,6 +218,7 @@
         "datasource_ids": [
           "npm_package_json"
         ],
+        "license_clarity": [],
         "purl": "pkg:npm/grunt-esvm@3.2.8"
       },
       {
@@ -294,6 +296,7 @@
         "datasource_ids": [
           "npm_package_json"
         ],
+        "license_clarity": [],
         "purl": "pkg:npm/angular-compare-validator@0.1.1"
       }
     ]

diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml
@@ -21,18 +21,18 @@ headers:
       for any legal advice.
       ScanCode is a free software code scanning tool from nexB Inc. and others.
       Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-    output_format_version: 3.0.0
+    output_format_version: 3.1.0
     message:
     errors: []
     warnings: []
     extra_data:
       system_environment:
-        operating_system: linux
+        operating_system: mac
         cpu_architecture: 64
-        platform: Linux-5.15.0-89-generic-x86_64-with-glibc2.29
-        platform_version: '#99~20.04.1-Ubuntu SMP Thu Nov 2 15:16:47 UTC 2023'
-        python_version: "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]"
-      spdx_license_list_version: '3.22'
+        platform: macOS-14.5-x86_64-i386-64bit
+        platform_version: 'Darwin Kernel Version 23.5.0: Wed May  1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103'
+        python_version: 3.12.3 (main, Apr  9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)]
+      spdx_license_list_version: '3.23'
       files_count: 4
 summary:
   declared_license_expression: apache-2.0 AND cddl-1.0 AND mit
@@ -139,6 +139,7 @@ packages:
       - manifests/maven/persistence-api-1.0.pom
     datasource_ids:
       - maven_pom
+    license_clarity: []
     purl: pkg:maven/javax.persistence/persistence-api@1.0
   - type: npm
     namespace:
@@ -224,6 +225,7 @@ packages:
       - manifests/npm-license-mapping/package.json
     datasource_ids:
       - npm_package_json
+    license_clarity: []
     purl: pkg:npm/grunt-esvm@3.2.8
   - type: npm
     namespace:
@@ -289,6 +291,7 @@ packages:
       - manifests/npm-license-string/package.json
     datasource_ids:
       - npm_package_json
+    license_clarity: []
     purl: pkg:npm/angular-compare-validator@0.1.1
 dependencies:
   - purl: pkg:npm/bluebird

diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -9,19 +9,19 @@
           "--json-lines": "<file>"
         },
         "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-        "output_format_version": "3.0.0",
+        "output_format_version": "3.1.0",
         "message": null,
         "errors": [],
         "warnings": [],
         "extra_data": {
           "system_environment": {
             "operating_system": "mac",
             "cpu_architecture": "64",
-            "platform": "macOS-13.2.1-x86_64-i386-64bit",
-            "platform_version": "Darwin Kernel Version 22.3.0: Mon Jan 30 20:39:35 PST 2023; root:xnu-8792.81.3~2/RELEASE_ARM64_T8103",
-            "python_version": "3.10.6 (main, Aug 30 2022, 05:12:36) [Clang 13.1.6 (clang-1316.0.21.2.5)]"
+            "platform": "macOS-14.5-x86_64-i386-64bit",
+            "platform_version": "Darwin Kernel Version 23.5.0: Wed May  1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103",
+            "python_version": "3.12.3 (main, Apr  9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)]"
           },
-          "spdx_license_list_version": "3.20",
+          "spdx_license_list_version": "3.23",
           "files_count": 1
         }
       }

diff --git a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
@@ -21,18 +21,18 @@ headers:
       for any legal advice.
       ScanCode is a free software code scanning tool from nexB Inc. and others.
       Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-    output_format_version: 3.0.0
+    output_format_version: 3.1.0
     message:
     errors: []
     warnings: []
     extra_data:
       system_environment:
-        operating_system: linux
+        operating_system: mac
         cpu_architecture: 64
-        platform: Linux-5.15.0-89-generic-x86_64-with-glibc2.29
-        platform_version: '#99~20.04.1-Ubuntu SMP Thu Nov 2 15:16:47 UTC 2023'
-        python_version: "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]"
-      spdx_license_list_version: '3.22'
+        platform: macOS-14.5-x86_64-i386-64bit
+        platform_version: 'Darwin Kernel Version 23.5.0: Wed May  1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103'
+        python_version: 3.12.3 (main, Apr  9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)]
+      spdx_license_list_version: '3.23'
       files_count: 4
 summary:
   declared_license_expression: apache-2.0
@@ -119,6 +119,7 @@ packages:
       - package-and-licenses/setup.cfg
     datasource_ids:
       - pypi_setup_cfg
+    license_clarity: []
     purl: pkg:pypi/codebase
 dependencies: []
 license_detections:

diff --git a/tests/formattedcode/data/yaml/simple-expected.yaml b/tests/formattedcode/data/yaml/simple-expected.yaml
@@ -14,18 +14,18 @@ headers:
       for any legal advice.
       ScanCode is a free software code scanning tool from nexB Inc. and others.
       Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-    output_format_version: 3.0.0
+    output_format_version: 3.1.0
     message:
     errors: []
     warnings: []
     extra_data:
       system_environment:
         operating_system: mac
         cpu_architecture: 64
-        platform: macOS-13.2.1-x86_64-i386-64bit
-        platform_version: 'Darwin Kernel Version 22.3.0: Mon Jan 30 20:39:35 PST 2023; root:xnu-8792.81.3~2/RELEASE_ARM64_T8103'
-        python_version: 3.10.6 (main, Aug 30 2022, 05:12:36) [Clang 13.1.6 (clang-1316.0.21.2.5)]
-      spdx_license_list_version: '3.20'
+        platform: macOS-14.5-x86_64-i386-64bit
+        platform_version: 'Darwin Kernel Version 23.5.0: Wed May  1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103'
+        python_version: 3.12.3 (main, Apr  9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)]
+      spdx_license_list_version: '3.23'
       files_count: 1
 packages: []
 dependencies: []

diff --git a/...nsedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json b/...nsedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json
@@ -80,6 +80,7 @@
       "datasource_ids": [
         "npm_package_json"
       ],
+      "license_clarity": [],
       "purl": "pkg:npm/npm@2.13.5"
     }
   ],

diff --git a/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json b/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json
@@ -80,6 +80,7 @@
       "datasource_ids": [
         "npm_package_json"
       ],
+      "license_clarity": [],
       "purl": "pkg:npm/npm@2.13.5"
     }
   ],

diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json
@@ -75,6 +75,7 @@
       "datasource_ids": [
         "about_file"
       ],
+      "license_clarity": [],
       "purl": "pkg:about/apipkg@1.4"
     },
     {
@@ -164,6 +165,7 @@
       "datasource_ids": [
         "about_file"
       ],
+      "license_clarity": [],
       "purl": "pkg:about/appdirs@1.4.3"
     }
   ],

diff --git a/tests/packagedcode/data/about/apipkg.ABOUT-expected b/tests/packagedcode/data/about/apipkg.ABOUT-expected
@@ -39,17 +39,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }

diff --git a/tests/packagedcode/data/about/appdirs.ABOUT-expected b/tests/packagedcode/data/about/appdirs.ABOUT-expected
@@ -39,17 +39,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }

diff --git a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json
@@ -90,6 +90,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/etc/fstab",
@@ -302,6 +303,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/lib/ld-musl-x86_64.so.1",
@@ -406,6 +408,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/bin/busybox",
@@ -573,6 +576,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/etc/motd",
@@ -929,6 +933,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/etc/apk/keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub",
@@ -1222,6 +1227,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/etc/ssl/certs/ca-certificates.crt",
@@ -1335,6 +1341,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/etc/ssl/ct_log_list.cnf",
@@ -1520,6 +1527,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/lib/libssl.so.1.1",
@@ -1612,6 +1620,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/usr/bin/ssl_client",
@@ -1716,6 +1725,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/lib/libz.so.1.2.12",
@@ -1808,6 +1818,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/lib/libapk.so.3.12.0",
@@ -1909,6 +1920,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/usr/bin/scanelf",
@@ -2001,6 +2013,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [
       {
         "path": "alpine-container-layer.tar.xz/sbin/ldconfig",
@@ -2129,6 +2142,7 @@
     "datasource_ids": [
       "alpine_installed_db"
     ],
+    "license_clarity": [],
     "resources": [],
     "purl": "pkg:alpine/libc-utils@0.7.2-r3?arch=x86_64"
   }