Update expected test results

Signed-off-by: Jono Yang <[email protected]>
aboutcode-org · May 1, 2024 · 0b6b354 · 0b6b354
1 parent d3e9d3c
commit 0b6b354
Show file tree

Hide file tree

Showing 16 changed files with 76 additions and 76 deletions.
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
@@ -14,7 +14,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "sha256": "23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -60,7 +60,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "sha256": "23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -106,7 +106,7 @@
       "md5": "e999e21c9d7de4d0f943aefbb6f21b99",
       "sha256": "abd984f8715001bb54d5a2ef293b2c559861756b17c4461cde3ac08e9b61ec78",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -186,7 +186,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "sha256": "23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -232,7 +232,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "sha256": "23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -278,7 +278,7 @@
       "md5": "290627a1387288ef77ae7e07946f3ecf",
       "sha256": "271a9f4402a59c923ee04fd9bd3f2aa188d2b9e4741cef1b756ec7116f9d83ef",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,
@@ -324,7 +324,7 @@
       "md5": "88e46475db9b1a68f415f6a3544eeb16",
       "sha256": "f6810dc076ffe08dad2812318e414ac4123de9a612faabc35121206a4fa48ce4",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": "C",
       "is_binary": false,
       "is_text": true,

diff --git a/tests/formattedcode/data/templated/simple-expected.html b/tests/formattedcode/data/templated/simple-expected.html
@@ -124,7 +124,7 @@
               <td>bdf7c572beb4094c2059508fa73c05a4</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text, with no line terminators</td>
+              <td>Unicode text, UTF-8 text, with no line terminators</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>

diff --git a/tests/formattedcode/data/templated/tree/expected.html b/tests/formattedcode/data/templated/tree/expected.html
@@ -176,7 +176,7 @@
               <td>fc7f53659b7a9db8b6dff0638641778e</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -196,7 +196,7 @@
               <td>fc7f53659b7a9db8b6dff0638641778e</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -216,7 +216,7 @@
               <td>e999e21c9d7de4d0f943aefbb6f21b99</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -256,7 +256,7 @@
               <td>fc7f53659b7a9db8b6dff0638641778e</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -276,7 +276,7 @@
               <td>fc7f53659b7a9db8b6dff0638641778e</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -296,7 +296,7 @@
               <td>290627a1387288ef77ae7e07946f3ecf</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>
@@ -316,7 +316,7 @@
               <td>88e46475db9b1a68f415f6a3544eeb16</td>
               <td></td>
               <td>text/plain</td>
-              <td>UTF-8 Unicode text</td>
+              <td>Unicode text, UTF-8 text</td>
               <td>C</td>
               <td>False</td>
               <td>True</td>

diff --git a/tests/formattedcode/data/yaml/tree/expected.yaml b/tests/formattedcode/data/yaml/tree/expected.yaml
@@ -15,18 +15,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.14.0-1058-oem-x86_64-with-glibc2.29
-        platform_version: '#66-Ubuntu SMP Fri Feb 10 09:46:18 UTC 2023'
-        python_version: "3.8.10 (default, Nov 14 2022, 12:59:47) \n[GCC 9.4.0]"
-      spdx_license_list_version: '3.20'
+        platform: macOS-14.4.1-arm64-arm-64bit
+        platform_version: 'Darwin Kernel Version 23.4.0: Fri Mar 15 00:12:41 PDT 2024; root:xnu-10063.101.17~1/RELEASE_ARM64_T8103'
+        python_version: 3.12.2 (main, Apr 29 2024, 15:55:18) [Clang 15.0.0 (clang-1500.3.9.4)]
+      spdx_license_list_version: '3.23'
       files_count: 7
 packages: []
 dependencies: []
@@ -42,7 +42,7 @@ files:
     md5: fc7f53659b7a9db8b6dff0638641778e
     sha256: 23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -80,7 +80,7 @@ files:
     md5: fc7f53659b7a9db8b6dff0638641778e
     sha256: 23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -118,7 +118,7 @@ files:
     md5: e999e21c9d7de4d0f943aefbb6f21b99
     sha256: abd984f8715001bb54d5a2ef293b2c559861756b17c4461cde3ac08e9b61ec78
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -188,7 +188,7 @@ files:
     md5: fc7f53659b7a9db8b6dff0638641778e
     sha256: 23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -226,7 +226,7 @@ files:
     md5: fc7f53659b7a9db8b6dff0638641778e
     sha256: 23fe3ce8ad18772ea688a435bb624d65e08fdee1d31b9f620a1ba62619c0f201
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -264,7 +264,7 @@ files:
     md5: 290627a1387288ef77ae7e07946f3ecf
     sha256: 271a9f4402a59c923ee04fd9bd3f2aa188d2b9e4741cef1b756ec7116f9d83ef
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes
@@ -302,7 +302,7 @@ files:
     md5: 88e46475db9b1a68f415f6a3544eeb16
     sha256: f6810dc076ffe08dad2812318e414ac4123de9a612faabc35121206a4fa48ce4
     mime_type: text/plain
-    file_type: UTF-8 Unicode text
+    file_type: Unicode text, UTF-8 text
     programming_language: C
     is_binary: no
     is_text: yes

diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json
@@ -392,15 +392,15 @@
       "sha1": "f4399249b905c17338eb06776a7205d6f643d396",
       "md5": "d897358d498fd2dbb1efedfa297fc0f3",
       "sha256": "63940bc96c0feeef3b22b96d7d6a4873cdb7f12151ce3362967afdc7f8ec6698",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": false,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -467,15 +467,15 @@
       "sha1": "1ef59e75d33ed8b7b43548fd55843d894db4b910",
       "md5": "1385905becfdfd8d777342fcb1242d83",
       "sha256": "1780e44cd2317e04461131b34ea6fa5b1da4a571123c9a391ddc3b865c456298",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": "JavaScript",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": true,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -543,7 +543,7 @@
       "md5": "bd8911e2d8af0caa689f76b9975761fd",
       "sha256": "d27968b827780212a965387f5ec3421ee59a0bf9166847629db0e716e6d2d9c3",
       "mime_type": "application/json",
-      "file_type": "JSON data",
+      "file_type": "JSON text data",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,

diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -414,15 +414,15 @@
       "sha1": "f4399249b905c17338eb06776a7205d6f643d396",
       "md5": "d897358d498fd2dbb1efedfa297fc0f3",
       "sha256": "63940bc96c0feeef3b22b96d7d6a4873cdb7f12151ce3362967afdc7f8ec6698",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": false,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -489,15 +489,15 @@
       "sha1": "1ef59e75d33ed8b7b43548fd55843d894db4b910",
       "md5": "1385905becfdfd8d777342fcb1242d83",
       "sha256": "1780e44cd2317e04461131b34ea6fa5b1da4a571123c9a391ddc3b865c456298",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": "JavaScript",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": true,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -565,7 +565,7 @@
       "md5": "bd8911e2d8af0caa689f76b9975761fd",
       "sha256": "d27968b827780212a965387f5ec3421ee59a0bf9166847629db0e716e6d2d9c3",
       "mime_type": "application/json",
-      "file_type": "JSON data",
+      "file_type": "JSON text data",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,

diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json
@@ -529,7 +529,7 @@
       "md5": "e371da445e8b18fcf8ee5b8c26373007",
       "sha256": "dbd900a6c5e68795b2673418961804f26f534c1b122fe787f884b5f32df80ba9",
       "mime_type": "text/plain",
-      "file_type": "ASCII text, with CRLF line terminators",
+      "file_type": "JAR Manifest, ASCII text, with CRLF line terminators",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,

diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json
@@ -448,7 +448,7 @@
       "md5": "12bc948aef936e0dc81ef8dc269c442f",
       "sha256": "a6138a417208be3f9a5adb3f84fb4cc4e25a8b29e3106c456e324f82a854654a",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
@@ -758,7 +758,7 @@
       "md5": "e73df191f1b77901adab1471b758a8bc",
       "sha256": "ddb5a1fa9442c6cab92a3510365937e729f839c94b97e75d3f0430bf3a4dd2bd",
       "mime_type": "text/plain",
-      "file_type": "UTF-8 Unicode text",
+      "file_type": "Unicode text, UTF-8 text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,

diff --git a/tests/summarycode/data/score/no_license_or_copyright-expected.json b/tests/summarycode/data/score/no_license_or_copyright-expected.json
@@ -302,15 +302,15 @@
       "sha1": "7d770c5ffdcf659c944a670225ab43db9f33d4a8",
       "md5": "4b8955afbb3a8aa01933e99e331e4acf",
       "sha256": "aac3e1032f4dffd347854cbe37d559223f2d61173caa649ca7cd0cfb11987334",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": false,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -343,15 +343,15 @@
       "sha1": "53771edd1e0765de7400174e42ca2e8e5840055f",
       "md5": "ec9dc4294f83d24294f07e6a0676c338",
       "sha256": "2b61833228890116dded1849a683d31d0273e0cf985a7bf0cc419aa7edefd839",
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "mime_type": "application/javascript",
+      "file_type": "JavaScript source, ASCII text",
       "programming_language": "JavaScript",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
       "is_media": false,
       "is_source": true,
-      "is_script": false,
+      "is_script": true,
       "package_data": [],
       "for_packages": [
         "pkg:npm/%40invisionag/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758"
@@ -385,7 +385,7 @@
       "md5": "bc23bb45c7f272127a346faa8b97da74",
       "sha256": "a93777fcaee28dcc75e8b9187f5fae73ebc651d24f6825587c87553c5260a06d",
       "mime_type": "application/json",
-      "file_type": "JSON data",
+      "file_type": "JSON text data",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,