Skip to content

Commit 279c305

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Fix test failures
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent b10a399 commit 279c305

21 files changed

+711
-455
lines changed

‎tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json

Lines changed: 207 additions & 125 deletions
Large diffs are not rendered by default.

‎tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json

Lines changed: 87 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,88 @@
11
{
2+
"license_detections": [
3+
{
4+
"identifier": "example1_and_example2-450f710c-75c2-24fd-46e3-13bfded8d08e",
5+
"license_expression": "example1 AND example2",
6+
"count": 1,
7+
"detection_log": [
8+
"not-combined"
9+
],
10+
"matches": [
11+
{
12+
"score": 100.0,
13+
"start_line": 1,
14+
"end_line": 1,
15+
"matched_length": 9,
16+
"match_coverage": 100.0,
17+
"matcher": "2-aho",
18+
"license_expression": "example1",
19+
"rule_identifier": "example1.LICENSE",
20+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/example1.LICENSE"
21+
},
22+
{
23+
"score": 100.0,
24+
"start_line": 1,
25+
"end_line": 5,
26+
"matched_length": 69,
27+
"match_coverage": 100.0,
28+
"matcher": "2-aho",
29+
"license_expression": "example2",
30+
"rule_identifier": "example2.LICENSE",
31+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/example2.LICENSE"
32+
}
33+
]
34+
}
35+
],
36+
"license_references": [
37+
{
38+
"key": "example1",
39+
"short_name": "Example External License 1",
40+
"name": "Example External License 1",
41+
"category": "Permissive",
42+
"owner": "NexB",
43+
"spdx_license_key": "scancode-example1",
44+
"text": "The quick brown fox jumps over the lazy dog."
45+
},
46+
{
47+
"key": "example2",
48+
"short_name": "Example External License 2",
49+
"name": "Example External License 2",
50+
"category": "Permissive",
51+
"owner": "NexB",
52+
"spdx_license_key": "scancode-example2",
53+
"text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi\nut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit\nin voluptate velit esse cillum dolore eu fugiat nulla pariatur.\nExcepteur sint occaecat cupidatat non proident, sunt in culpa qui officia\ndeserunt mollit anim id est laborum."
54+
}
55+
],
56+
"license_rule_references": [
57+
{
58+
"rule_identifier": "example1.LICENSE",
59+
"license_expression": "example1",
60+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example1.LICENSE",
61+
"rule_relevance": 100,
62+
"rule_length": 9,
63+
"is_license_text": true,
64+
"is_license_notice": false,
65+
"is_license_reference": false,
66+
"is_license_tag": false,
67+
"is_license_intro": false,
68+
"referenced_filenames": [],
69+
"rule_text": "The quick brown fox jumps over the lazy dog."
70+
},
71+
{
72+
"rule_identifier": "example2.LICENSE",
73+
"license_expression": "example2",
74+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example2.LICENSE",
75+
"rule_relevance": 100,
76+
"rule_length": 69,
77+
"is_license_text": true,
78+
"is_license_notice": false,
79+
"is_license_reference": false,
80+
"is_license_tag": false,
81+
"is_license_intro": false,
82+
"referenced_filenames": [],
83+
"rule_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi\nut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit\nin voluptate velit esse cillum dolore eu fugiat nulla pariatur.\nExcepteur sint occaecat cupidatat non proident, sunt in culpa qui officia\ndeserunt mollit anim id est laborum."
84+
}
85+
],
286
"files": [
387
{
488
"path": "additional_license_directory_test.txt",
@@ -22,31 +106,6 @@
22106
"license_expression": "example1",
23107
"rule_identifier": "example1.LICENSE",
24108
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example1.LICENSE",
25-
"referenced_filenames": [],
26-
"is_license_text": true,
27-
"is_license_notice": false,
28-
"is_license_reference": false,
29-
"is_license_tag": false,
30-
"is_license_intro": false,
31-
"rule_length": 9,
32-
"rule_relevance": 100,
33-
"licenses": [
34-
{
35-
"key": "example1",
36-
"name": "Example External License 1",
37-
"short_name": "Example External License 1",
38-
"category": "Permissive",
39-
"is_exception": false,
40-
"is_unknown": false,
41-
"owner": "NexB",
42-
"homepage_url": null,
43-
"text_url": "",
44-
"reference_url": "https://scancode-licensedb.aboutcode.org/example1",
45-
"scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example1.LICENSE",
46-
"spdx_license_key": "scancode-example1",
47-
"spdx_url": "https://spdx.org/licenses/scancode-example1"
48-
}
49-
],
50109
"is_builtin": false
51110
},
52111
{
@@ -59,38 +118,16 @@
59118
"license_expression": "example2",
60119
"rule_identifier": "example2.LICENSE",
61120
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example2.LICENSE",
62-
"referenced_filenames": [],
63-
"is_license_text": true,
64-
"is_license_notice": false,
65-
"is_license_reference": false,
66-
"is_license_tag": false,
67-
"is_license_intro": false,
68-
"rule_length": 69,
69-
"rule_relevance": 100,
70-
"licenses": [
71-
{
72-
"key": "example2",
73-
"name": "Example External License 2",
74-
"short_name": "Example External License 2",
75-
"category": "Permissive",
76-
"is_exception": false,
77-
"is_unknown": false,
78-
"owner": "NexB",
79-
"homepage_url": null,
80-
"text_url": "",
81-
"reference_url": "https://scancode-licensedb.aboutcode.org/example2",
82-
"scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example2.LICENSE",
83-
"spdx_license_key": "scancode-example2",
84-
"spdx_url": "https://spdx.org/licenses/scancode-example2"
85-
}
86-
],
87121
"is_builtin": false
88122
}
89123
]
90124
}
91125
],
92126
"license_clues": [],
93127
"percentage_of_license_text": 95.12,
128+
"for_license_detections": [
129+
"example1_and_example2-450f710c-75c2-24fd-46e3-13bfded8d08e"
130+
],
94131
"scan_errors": []
95132
}
96133
]

‎tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json

Lines changed: 53 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,54 @@
11
{
2+
"license_detections": [
3+
{
4+
"identifier": "example_installed_1-061a0995-e68e-f37e-b163-25a2ec85db12",
5+
"license_expression": "example-installed-1",
6+
"count": 1,
7+
"detection_log": [
8+
"not-combined"
9+
],
10+
"matches": [
11+
{
12+
"score": 100.0,
13+
"start_line": 1,
14+
"end_line": 1,
15+
"matched_length": 11,
16+
"match_coverage": 100.0,
17+
"matcher": "1-hash",
18+
"license_expression": "example-installed-1",
19+
"rule_identifier": "example-installed-1.LICENSE",
20+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/example-installed-1.LICENSE"
21+
}
22+
]
23+
}
24+
],
25+
"license_references": [
26+
{
27+
"key": "example-installed-1",
28+
"short_name": "Example Installed License 1",
29+
"name": "Example Installed License 1",
30+
"category": "Permissive",
31+
"owner": "NexB",
32+
"spdx_license_key": "scancode-example-installed1",
33+
"text": "This is a test license that must be installed into ScanCode Toolkit."
34+
}
35+
],
36+
"license_rule_references": [
37+
{
38+
"rule_identifier": "example-installed-1.LICENSE",
39+
"license_expression": "example-installed-1",
40+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example-installed-1.LICENSE",
41+
"rule_relevance": 100,
42+
"rule_length": 11,
43+
"is_license_text": true,
44+
"is_license_notice": false,
45+
"is_license_reference": false,
46+
"is_license_tag": false,
47+
"is_license_intro": false,
48+
"referenced_filenames": [],
49+
"rule_text": "This is a test license that must be installed into ScanCode Toolkit."
50+
}
51+
],
252
"files": [
353
{
454
"path": "additional_license_plugin_test.txt",
@@ -22,38 +72,16 @@
2272
"license_expression": "example-installed-1",
2373
"rule_identifier": "example-installed-1.LICENSE",
2474
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example-installed-1.LICENSE",
25-
"referenced_filenames": [],
26-
"is_license_text": true,
27-
"is_license_notice": false,
28-
"is_license_reference": false,
29-
"is_license_tag": false,
30-
"is_license_intro": false,
31-
"rule_length": 11,
32-
"rule_relevance": 100,
33-
"licenses": [
34-
{
35-
"key": "example-installed-1",
36-
"name": "Example Installed License 1",
37-
"short_name": "Example Installed License 1",
38-
"category": "Permissive",
39-
"is_exception": false,
40-
"is_unknown": false,
41-
"owner": "NexB",
42-
"homepage_url": null,
43-
"text_url": "",
44-
"reference_url": "https://scancode-licensedb.aboutcode.org/example-installed-1",
45-
"scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/example-installed-1.LICENSE",
46-
"spdx_license_key": "scancode-example-installed1",
47-
"spdx_url": "https://spdx.org/licenses/scancode-example-installed1"
48-
}
49-
],
5075
"is_builtin": false
5176
}
5277
]
5378
}
5479
],
5580
"license_clues": [],
5681
"percentage_of_license_text": 100.0,
82+
"for_license_detections": [
83+
"example_installed_1-061a0995-e68e-f37e-b163-25a2ec85db12"
84+
],
5785
"scan_errors": []
5886
}
5987
]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
{
4545
"rule_identifier": "apache-1.0.LICENSE",
4646
"license_expression": "apache-1.0",
47+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
4748
"rule_relevance": 100,
4849
"rule_length": 368,
4950
"is_license_text": true,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
{
183183
"rule_identifier": "spdx-license-identifier: mit",
184184
"license_expression": "mit",
185+
"rule_url": null,
185186
"rule_relevance": 100,
186187
"rule_length": 1,
187188
"is_license_text": false,
@@ -195,6 +196,7 @@
195196
{
196197
"rule_identifier": "mit_272.RULE",
197198
"license_expression": "mit",
199+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
198200
"rule_relevance": 100,
199201
"rule_length": 3,
200202
"is_license_text": false,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
{
4444
"rule_identifier": "blessing.LICENSE",
4545
"license_expression": "blessing",
46+
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
4647
"rule_relevance": 100,
4748
"rule_length": 42,
4849
"is_license_text": true,

‎tests/scancode/data/unicodepath/unicodepath.expected-mac.json

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"dependencies": [],
32
"packages": [],
3+
"dependencies": [],
4+
"license_detections": [],
5+
"license_references": [],
6+
"license_rule_references": [],
47
"files": [
58
{
69
"path": "unicodepath",
@@ -21,16 +24,17 @@
2124
"is_media": false,
2225
"is_source": false,
2326
"is_script": false,
24-
"license_detections": [],
25-
"license_clues": [],
27+
"package_data": [],
28+
"for_packages": [],
2629
"detected_license_expression": null,
2730
"detected_license_expression_spdx": null,
31+
"license_detections": [],
32+
"license_clues": [],
2833
"percentage_of_license_text": 0,
34+
"for_license_detections": [],
2935
"copyrights": [],
3036
"holders": [],
3137
"authors": [],
32-
"package_data": [],
33-
"for_packages": [],
3438
"emails": [],
3539
"urls": [],
3640
"files_count": 3,
@@ -57,16 +61,17 @@
5761
"is_media": false,
5862
"is_source": false,
5963
"is_script": false,
60-
"license_detections": [],
61-
"license_clues": [],
64+
"package_data": [],
65+
"for_packages": [],
6266
"detected_license_expression": null,
6367
"detected_license_expression_spdx": null,
68+
"license_detections": [],
69+
"license_clues": [],
6470
"percentage_of_license_text": 0,
71+
"for_license_detections": [],
6572
"copyrights": [],
6673
"holders": [],
6774
"authors": [],
68-
"package_data": [],
69-
"for_packages": [],
7075
"emails": [],
7176
"urls": [],
7277
"files_count": 0,
@@ -93,16 +98,17 @@
9398
"is_media": false,
9499
"is_source": false,
95100
"is_script": false,
96-
"license_detections": [],
97-
"license_clues": [],
101+
"package_data": [],
102+
"for_packages": [],
98103
"detected_license_expression": null,
99104
"detected_license_expression_spdx": null,
105+
"license_detections": [],
106+
"license_clues": [],
100107
"percentage_of_license_text": 0,
108+
"for_license_detections": [],
101109
"copyrights": [],
102110
"holders": [],
103111
"authors": [],
104-
"package_data": [],
105-
"for_packages": [],
106112
"emails": [],
107113
"urls": [],
108114
"files_count": 0,
@@ -129,16 +135,17 @@
129135
"is_media": false,
130136
"is_source": false,
131137
"is_script": false,
132-
"license_detections": [],
133-
"license_clues": [],
138+
"package_data": [],
139+
"for_packages": [],
134140
"detected_license_expression": null,
135141
"detected_license_expression_spdx": null,
142+
"license_detections": [],
143+
"license_clues": [],
136144
"percentage_of_license_text": 0,
145+
"for_license_detections": [],
137146
"copyrights": [],
138147
"holders": [],
139148
"authors": [],
140-
"package_data": [],
141-
"for_packages": [],
142149
"emails": [],
143150
"urls": [],
144151
"files_count": 0,

0 commit comments

Comments
 (0)