Skip to content

Commit 569e43f

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Update test expectations and fix bugs
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent cfe6d13 commit 569e43f

File tree

18 files changed

+23
-22
lines changed

18 files changed

+23
-22
lines changed

‎src/licensedcode/data/licenses/embedthis-extension.LICENSE‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ category: Free Restricted
66
owner: Embedthis
77
homepage_url: https://www.embedthis.com/licensing/extension.html
88
spdx_license_key: LicenseRef-scancode-embedthis-extension
9+
minimum_coverage: 95
910
---
1011

11-
Embedthis Extension License
12+
{{Embedthis Extension License}}
1213

1314
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1415

1516
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1617

1718
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1819

19-
The Software is used with an Embedthis product licensed under an Embedthis Commercial License.
20+
The Software is used with an Embedthis product licensed under an {{Embedthis Commercial License}}.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,,,,,,https://github.com/nexB
88
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,8,,,,,,,,,,,,http://www.apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
99
license,file,license,license,,679,2022-04-20,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1010
license,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,gpl-2.0-plus,GPL-2.0-or-later,scan/license,1,12,1-hash,100.00,113,100.00,100.00,gpl-2.0-plus_420.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
11-
package.json,file,package.json,package,.json,2200,2022-04-20,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,saxix-mit AND mit,LicenseRef-scancode-saxix-mit AND MIT,46.05,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
12-
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,saxix-mit AND mit,,saxix-mit,LicenseRef-scancode-saxix-mit,scan/package.json,24,24,3-seq,75.27,137,75.27,100.00,saxix-mit.LICENSE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/saxix-mit.LICENSE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
13-
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,saxix-mit AND mit,,mit,MIT,scan/package.json,24,24,2-aho,100.00,3,100.00,100.00,mit_27.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
11+
package.json,file,package.json,package,.json,2200,2022-04-20,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
12+
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,mit,MIT,scan/package.json,24,24,2-aho,100.00,3,100.00,100.00,mit_27.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
13+
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,mit,MIT,scan/package.json,24,24,3-seq,84.68,136,85.53,99.00,mit_823.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1414
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,Copyright (c) 2012 LearnBoost <tj@learnboost.com>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1515
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1616
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,,,,TJ Holowaychuk,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1717
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1818
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1919
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
20-
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,,saxix-mit AND mit,LicenseRef-scancode-saxix-mit AND MIT,"[{'license_expression': 'saxix-mit AND mit', 'license_expression_spdx': 'LicenseRef-scancode-saxix-mit AND MIT', 'matches': [{'license_expression': 'saxix-mit', 'spdx_license_expression': 'LicenseRef-scancode-saxix-mit', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '3-seq', 'score': 75.27, 'matched_length': 137, 'match_coverage': 75.27, 'rule_relevance': 100, 'rule_identifier': 'saxix-mit.LICENSE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/saxix-mit.LICENSE'}, {'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '2-aho', 'score': 100.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 100, 'rule_identifier': 'mit_27.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}], 'identifier': 'saxix_mit_and_mit-9a98e856-27fa-7d03-84a2-297dc2384cec'}]",,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/cookie-signature@1.0.3
20+
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,,mit,MIT,"[{'license_expression': 'mit', 'license_expression_spdx': 'MIT', 'matches': [{'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '2-aho', 'score': 100.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 100, 'rule_identifier': 'mit_27.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '3-seq', 'score': 84.68, 'matched_length': 136, 'match_coverage': 85.53, 'rule_relevance': 99, 'rule_identifier': 'mit_823.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE'}], 'identifier': 'mit-13195f55-8383-ff05-7a20-04ec94bbf4b1'}]",,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/cookie-signature@1.0.3

‎tests/formattedcode/data/spdx/license_known/expected.rdf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
9595
},
9696
"@rdf:about": "#SPDXRef-DOCUMENT",
97-
"rdfs:comment": "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.\nSPDX License List: 3.22",
97+
"rdfs:comment": "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.\nSPDX License List: 3.23",
9898
"spdx:name": "SPDX Document created by ScanCode Toolkit",
9999
"spdx:specVersion": "SPDX-2.2"
100100
},

‎tests/formattedcode/data/spdx/license_known/expected.tv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.22</text>
13+
SPDX License List: 3.23</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_known/expected_with_text.rdf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
9595
},
9696
"@rdf:about": "#SPDXRef-DOCUMENT",
97-
"rdfs:comment": "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.\nSPDX License List: 3.22",
97+
"rdfs:comment": "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.\nSPDX License List: 3.23",
9898
"spdx:name": "SPDX Document created by ScanCode Toolkit",
9999
"spdx:specVersion": "SPDX-2.2"
100100
},

‎tests/formattedcode/data/spdx/license_known/expected_with_text.tv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.22</text>
13+
SPDX License List: 3.23</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_ref/expected.rdf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117
}
118118
],
119-
"rdfs:comment": "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.\nSPDX License List: 3.22",
119+
"rdfs:comment": "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.\nSPDX License List: 3.23",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

‎tests/formattedcode/data/spdx/license_ref/expected.tv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.22</text>
13+
SPDX License List: 3.23</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117
}
118118
],
119-
"rdfs:comment": "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.\nSPDX License List: 3.22",
119+
"rdfs:comment": "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.\nSPDX License List: 3.23",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

‎tests/formattedcode/data/spdx/license_ref/expected_with_text.tv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.22</text>
13+
SPDX License List: 3.23</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

0 commit comments

Comments
 (0)