fix(fossid-webapp): Remove unecessary call to normalize

This call was needed because of the bug fixed by [1]. Therefore, it can now be removed. A test is also added that checks this behavior. [1]: #8447 Signed-off-by: Nicolas Nobelis <[email protected]>
oss-review-toolkit · Apr 8, 2024 · 29f5236 · 29f5236
1 parent f1623e8
commit 29f5236
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/plugins/scanners/fossid/src/main/kotlin/FossIdScanResults.kt b/plugins/scanners/fossid/src/main/kotlin/FossIdScanResults.kt
@@ -221,7 +221,7 @@ internal fun mapSnippetFindings(
             val ortSnippetLocation = snippetLocation ?: TextLocation(snippet.file, TextLocation.UNKNOWN_LINE)
 
             val license = snippet.artifactLicense?.let { artifactLicense ->
-                mapLicense(artifactLicense, ortSnippetLocation, issues, detectedLicenseMapping)?.license?.normalize()
+                mapLicense(artifactLicense, ortSnippetLocation, issues, detectedLicenseMapping)?.license
             } ?: SpdxConstants.NOASSERTION.toSpdx()
 
             val ortSnippet = OrtSnippet(

diff --git a/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt b/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt
@@ -69,6 +69,21 @@ class FossIdLicenseMappingTest : WordSpec({
             }
         }
 
+        "map deprecated SPDX FossId licenses in a snippet to snippet findings" {
+            val rawResults = createSnippet("GFDL-1.2")
+            val issues = mutableListOf<Issue>()
+
+            val findings = mapSnippetFindings(rawResults, issues, emptyMap(), emptyList(), mutableSetOf())
+
+            issues should beEmpty()
+            findings should haveSize(1)
+            findings.first() shouldNotBeNull {
+                snippets.first() shouldNotBeNull {
+                    licenses.toString() shouldBe "GFDL-1.2-only"
+                }
+            }
+        }
+
         "map SPDX compliant FossId licenses in a snippet to snippet findings" {
             val rawResults = createSnippet("Apache-2.0")
             val issues = mutableListOf<Issue>()