Skip to content

Commit f1d83fa

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Update test expectations for extracted license statements
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent 45ecc84 commit f1d83fa

File tree

289 files changed

+398
-396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+398
-396
lines changed

‎tests/formattedcode/data/csv/packages/expected-no-root.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
22
package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
3-
package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]
3+
package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0
4+
",,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]

‎tests/formattedcode/data/csv/packages/expected.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
22
scan/,directory,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
33
scan/package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4-
scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]
4+
scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0
5+
",,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]

‎tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"other_license_expression": null,
6464
"other_license_expression_spdx": null,
6565
"other_license_detections": [],
66-
"extracted_license_statement": "['Artistic-2.0 OR MIT']",
66+
"extracted_license_statement": "- Artistic-2.0 OR MIT\n",
6767
"notice_text": null,
6868
"source_packages": [],
6969
"extra_data": {},
@@ -514,7 +514,7 @@
514514
"other_license_expression": null,
515515
"other_license_expression_spdx": null,
516516
"other_license_detections": [],
517-
"extracted_license_statement": "['Artistic-2.0 OR MIT']",
517+
"extracted_license_statement": "- Artistic-2.0 OR MIT\n",
518518
"notice_text": null,
519519
"source_packages": [],
520520
"file_references": [],

‎tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"other_license_expression": null,
6464
"other_license_expression_spdx": null,
6565
"other_license_detections": [],
66-
"extracted_license_statement": "['Artistic-2.0 OR MIT']",
66+
"extracted_license_statement": "- Artistic-2.0 OR MIT\n",
6767
"notice_text": null,
6868
"source_packages": [],
6969
"extra_data": {},
@@ -508,7 +508,7 @@
508508
"other_license_expression": null,
509509
"other_license_expression_spdx": null,
510510
"other_license_detections": [],
511-
"extracted_license_statement": "['Artistic-2.0 OR MIT']",
511+
"extracted_license_statement": "- Artistic-2.0 OR MIT\n",
512512
"notice_text": null,
513513
"source_packages": [],
514514
"file_references": [],

‎tests/licensedcode/data/plugin_license/package/package.expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"other_license_expression": null,
6464
"other_license_expression_spdx": null,
6565
"other_license_detections": [],
66-
"extracted_license_statement": "[{'type': 'MIT', 'url': 'http://github.com/mscdex/busboy/raw/master/LICENSE'}]",
66+
"extracted_license_statement": "- type: MIT\n url: http://github.com/mscdex/busboy/raw/master/LICENSE\n",
6767
"notice_text": null,
6868
"source_packages": [],
6969
"extra_data": {},
@@ -190,7 +190,7 @@
190190
"other_license_expression": null,
191191
"other_license_expression_spdx": null,
192192
"other_license_detections": [],
193-
"extracted_license_statement": "[{'type': 'MIT', 'url': 'http://github.com/mscdex/busboy/raw/master/LICENSE'}]",
193+
"extracted_license_statement": "- type: MIT\n url: http://github.com/mscdex/busboy/raw/master/LICENSE\n",
194194
"notice_text": null,
195195
"source_packages": [],
196196
"file_references": [],

‎tests/packagedcode/data/bower/author-objects/expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"other_license_expression": null,
107107
"other_license_expression_spdx": null,
108108
"other_license_detections": [],
109-
"extracted_license_statement": "['MIT', 'Apache 2.0', 'BSD-3-Clause']",
109+
"extracted_license_statement": "- MIT\n- Apache 2.0\n- BSD-3-Clause\n",
110110
"notice_text": null,
111111
"source_packages": [],
112112
"file_references": [],

‎tests/packagedcode/data/bower/list-of-licenses/expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"other_license_expression": null,
100100
"other_license_expression_spdx": null,
101101
"other_license_detections": [],
102-
"extracted_license_statement": "['MIT', 'Apache 2.0', 'BSD-3-Clause']",
102+
"extracted_license_statement": "- MIT\n- Apache 2.0\n- BSD-3-Clause\n",
103103
"notice_text": null,
104104
"source_packages": [],
105105
"file_references": [],

‎tests/packagedcode/data/bower/scan-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"other_license_expression": null,
108108
"other_license_expression_spdx": null,
109109
"other_license_detections": [],
110-
"extracted_license_statement": "['MIT', 'Apache 2.0', 'BSD-3-Clause']",
110+
"extracted_license_statement": "- MIT\n- Apache 2.0\n- BSD-3-Clause\n",
111111
"notice_text": null,
112112
"source_packages": [],
113113
"extra_data": {},
@@ -287,7 +287,7 @@
287287
"other_license_expression": null,
288288
"other_license_expression_spdx": null,
289289
"other_license_detections": [],
290-
"extracted_license_statement": "['MIT', 'Apache 2.0', 'BSD-3-Clause']",
290+
"extracted_license_statement": "- MIT\n- Apache 2.0\n- BSD-3-Clause\n",
291291
"notice_text": null,
292292
"source_packages": [],
293293
"file_references": [],

‎tests/packagedcode/data/build/buck/end2end-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"other_license_expression": null,
9797
"other_license_expression_spdx": null,
9898
"other_license_detections": [],
99-
"extracted_license_statement": "['LICENSE']",
99+
"extracted_license_statement": "- LICENSE\n",
100100
"notice_text": null,
101101
"source_packages": [],
102102
"extra_data": {},

‎tests/packagedcode/data/debian/basic-rootfs-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
"identifier": "lgpl_2_1_plus_and_lgpl_2_1-1018860f-b475-01e3-bdd4-39bf3444650e"
342342
}
343343
],
344-
"extracted_license_statement": "['LGPL-2.1+', 'LGPL-2.1+', 'LGPL-2.1+']",
344+
"extracted_license_statement": "- LGPL-2.1+\n- LGPL-2.1+\n- LGPL-2.1+\n",
345345
"notice_text": null,
346346
"source_packages": [
347347
"pkg:deb/libndp"
@@ -711,7 +711,7 @@
711711
"identifier": "lgpl_2_1_plus_and_lgpl_2_1-1018860f-b475-01e3-bdd4-39bf3444650e"
712712
}
713713
],
714-
"extracted_license_statement": "['LGPL-2.1+', 'LGPL-2.1+', 'LGPL-2.1+']",
714+
"extracted_license_statement": "- LGPL-2.1+\n- LGPL-2.1+\n- LGPL-2.1+\n",
715715
"notice_text": null,
716716
"source_packages": [],
717717
"file_references": [],

0 commit comments

Comments
 (0)