Skip to content

Commit 0491bd2

Browse files
teyesanteyesan
committed
Update fizzler.expected.json to reflect corrected nuget license extraction
Signed-off-by: Temi Eyesan <teyesan06@icloud.com>
1 parent 2abe934 commit 0491bd2

1 file changed

Lines changed: 37 additions & 89 deletions

File tree

‎tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json‎

Lines changed: 37 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@
4343
"license_expression": "unknown-license-reference",
4444
"license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
4545
"from_file": "fizzler/Fizzler.nuspec",
46-
"start_line": 1,
47-
"end_line": 1,
48-
"matcher": "1-hash",
49-
"score": 16.0,
50-
"matched_length": 3,
46+
"start_line": 9,
47+
"end_line": 9,
48+
"matcher": "2-aho",
49+
"score": 33.0,
50+
"matched_length": 6,
5151
"match_coverage": 100.0,
52-
"rule_relevance": 16,
53-
"rule_identifier": "unknown-license-reference_383.RULE",
54-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
55-
"matched_text": "license COPYING.txt"
52+
"rule_relevance": 33,
53+
"rule_identifier": "unknown-license-reference_382.RULE",
54+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
55+
"matched_text": " <license type=\"file\">COPYING.txt</license>",
56+
"matched_text_diagnostics": "license type=\"file\">COPYING.txt</license>"
5657
},
5758
{
5859
"license_expression": "lgpl-2.1-plus",
@@ -87,21 +88,23 @@
8788
"matched_text_diagnostics": "LICENSE\n \nGNU GENERAL PUBLIC LICENSE"
8889
}
8990
],
90-
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-15b4d27c-9fa6-eb84-010f-152d45207f46",
9191
"detection_log": [
9292
"package-unknown-reference-to-local-file"
93-
]
93+
],
94+
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-62bd07da-4dc9-fb2e-ad66-9eafe419c120"
9495
}
9596
],
9697
"other_license_expression": null,
9798
"other_license_expression_spdx": null,
9899
"other_license_detections": [],
99-
"extracted_license_statement": "'@type': file\n'#text': COPYING.txt\n",
100+
"extracted_license_statement": null,
100101
"notice_text": null,
101102
"source_packages": [],
102103
"is_private": false,
103104
"is_virtual": false,
104-
"extra_data": {},
105+
"extra_data": {
106+
"license_file": "COPYING.txt"
107+
},
105108
"repository_homepage_url": "https://www.nuget.org/packages/Fizzler/1.3.0",
106109
"repository_download_url": "https://www.nuget.org/api/v2/package/Fizzler/1.3.0",
107110
"api_data_url": "https://api.nuget.org/v3/registration3/fizzler/1.3.0.json",
@@ -154,71 +157,13 @@
154157
}
155158
],
156159
"license_detections": [
157-
{
158-
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-15b4d27c-9fa6-eb84-010f-152d45207f46",
159-
"license_expression": "lgpl-2.1-plus AND gpl-1.0-plus",
160-
"license_expression_spdx": "LGPL-2.1-or-later AND GPL-1.0-or-later",
161-
"detection_count": 1,
162-
"detection_log": [
163-
"package-unknown-reference-to-local-file"
164-
],
165-
"reference_matches": [
166-
{
167-
"license_expression": "unknown-license-reference",
168-
"license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
169-
"from_file": "fizzler/Fizzler.nuspec",
170-
"start_line": 1,
171-
"end_line": 1,
172-
"matcher": "1-hash",
173-
"score": 16.0,
174-
"matched_length": 3,
175-
"match_coverage": 100.0,
176-
"rule_relevance": 16,
177-
"rule_identifier": "unknown-license-reference_383.RULE",
178-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
179-
"matched_text": "license COPYING.txt"
180-
},
181-
{
182-
"license_expression": "lgpl-2.1-plus",
183-
"license_expression_spdx": "LGPL-2.1-or-later",
184-
"from_file": "fizzler/COPYING.txt",
185-
"start_line": 1,
186-
"end_line": 1,
187-
"matcher": "2-aho",
188-
"score": 100.0,
189-
"matched_length": 5,
190-
"match_coverage": 100.0,
191-
"rule_relevance": 100,
192-
"rule_identifier": "lgpl-2.1-plus_485.RULE",
193-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_485.RULE",
194-
"matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
195-
"matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
196-
},
197-
{
198-
"license_expression": "gpl-1.0-plus",
199-
"license_expression_spdx": "GPL-1.0-or-later",
200-
"from_file": "fizzler/COPYING.txt",
201-
"start_line": 1,
202-
"end_line": 3,
203-
"matcher": "2-aho",
204-
"score": 100.0,
205-
"matched_length": 5,
206-
"match_coverage": 100.0,
207-
"rule_relevance": 100,
208-
"rule_identifier": "gpl_160.RULE",
209-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_160.RULE",
210-
"matched_text": "GNU LESSER GENERAL PUBLIC LICENSE\n \nGNU GENERAL PUBLIC LICENSE",
211-
"matched_text_diagnostics": "LICENSE\n \nGNU GENERAL PUBLIC LICENSE"
212-
}
213-
]
214-
},
215160
{
216161
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-62bd07da-4dc9-fb2e-ad66-9eafe419c120",
217162
"license_expression": "lgpl-2.1-plus AND gpl-1.0-plus",
218163
"license_expression_spdx": "LGPL-2.1-or-later AND GPL-1.0-or-later",
219-
"detection_count": 1,
164+
"detection_count": 2,
220165
"detection_log": [
221-
"unknown-reference-to-local-file"
166+
"package-unknown-reference-to-local-file"
222167
],
223168
"reference_matches": [
224169
{
@@ -414,16 +359,17 @@
414359
"license_expression": "unknown-license-reference",
415360
"license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
416361
"from_file": "fizzler/Fizzler.nuspec",
417-
"start_line": 1,
418-
"end_line": 1,
419-
"matcher": "1-hash",
420-
"score": 16.0,
421-
"matched_length": 3,
362+
"start_line": 9,
363+
"end_line": 9,
364+
"matcher": "2-aho",
365+
"score": 33.0,
366+
"matched_length": 6,
422367
"match_coverage": 100.0,
423-
"rule_relevance": 16,
424-
"rule_identifier": "unknown-license-reference_383.RULE",
425-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
426-
"matched_text": "license COPYING.txt"
368+
"rule_relevance": 33,
369+
"rule_identifier": "unknown-license-reference_382.RULE",
370+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
371+
"matched_text": " <license type=\"file\">COPYING.txt</license>",
372+
"matched_text_diagnostics": "license type=\"file\">COPYING.txt</license>"
427373
},
428374
{
429375
"license_expression": "lgpl-2.1-plus",
@@ -458,22 +404,24 @@
458404
"matched_text_diagnostics": "LICENSE\n \nGNU GENERAL PUBLIC LICENSE"
459405
}
460406
],
461-
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-15b4d27c-9fa6-eb84-010f-152d45207f46",
462407
"detection_log": [
463408
"package-unknown-reference-to-local-file"
464-
]
409+
],
410+
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-62bd07da-4dc9-fb2e-ad66-9eafe419c120"
465411
}
466412
],
467413
"other_license_expression": null,
468414
"other_license_expression_spdx": null,
469415
"other_license_detections": [],
470-
"extracted_license_statement": "'@type': file\n'#text': COPYING.txt\n",
416+
"extracted_license_statement": null,
471417
"notice_text": null,
472418
"source_packages": [],
473419
"file_references": [],
474420
"is_private": false,
475421
"is_virtual": false,
476-
"extra_data": {},
422+
"extra_data": {
423+
"license_file": "COPYING.txt"
424+
},
477425
"dependencies": [
478426
{
479427
"purl": "pkg:nuget/NETStandard.Library",
@@ -514,8 +462,8 @@
514462
"for_packages": [
515463
"pkg:nuget/Fizzler@1.3.0?uuid=fixed-uid-done-for-testing-5642512d1758"
516464
],
517-
"detected_license_expression": "lgpl-2.1-plus AND gpl-1.0-plus",
518-
"detected_license_expression_spdx": "LGPL-2.1-or-later AND GPL-1.0-or-later",
465+
"detected_license_expression": "unknown-license-reference",
466+
"detected_license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
519467
"license_detections": [
520468
{
521469
"license_expression": "lgpl-2.1-plus AND gpl-1.0-plus",
@@ -571,7 +519,7 @@
571519
}
572520
],
573521
"detection_log": [
574-
"unknown-reference-to-local-file"
522+
"package-unknown-reference-to-local-file"
575523
],
576524
"identifier": "lgpl_2_1_plus_and_gpl_1_0_plus-62bd07da-4dc9-fb2e-ad66-9eafe419c120"
577525
}

0 commit comments

Comments
 (0)