From 445126b36ab71f366e67698d911f5096d8418918 Mon Sep 17 00:00:00 2001 From: Jan-Niclas Struewer Date: Sat, 9 Nov 2024 08:35:46 +0100 Subject: [PATCH] test: updated tests to take changes to VulnerabilityDto format into account --- .../fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt | 4 +--- .../iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt index 901451f..4bf7d6d 100644 --- a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt +++ b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt @@ -29,9 +29,7 @@ class OsvAdapterTest { ] ) fun testInvalidJson(input: String) { - input.byteInputStream().use { - assertThrows { OsvAdapter.dtoFromJson(it) } - } + input.byteInputStream().use { assertThrows { OsvAdapter.dtoFromJson(it) } } } @ParameterizedTest diff --git a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt index 00398e1..2d96793 100644 --- a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt +++ b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt @@ -57,7 +57,8 @@ class TrivyAdapterTest { val vuln = dto.vulnerabilities.first() assertEquals("CVE-2011-3374", vuln.cveIdentifier) - assertEquals("apt@2.6.1", vuln.packageName) + assertEquals("apt", vuln.packageName) + assertEquals("2.6.1", vuln.version) assertEquals(4.3, vuln.severity) } } @@ -69,7 +70,8 @@ class TrivyAdapterTest { assertEquals(2, dto.vulnerabilities.count()) assertTrue { dto.vulnerabilities.all { it.cveIdentifier == "CVE-2005-2541" } } - assertEquals("tar@1.34+dfsg-1.2", dto.vulnerabilities.first().packageName) + assertEquals("tar", dto.vulnerabilities.first().packageName) + assertEquals("1.34+dfsg-1.2", dto.vulnerabilities.first().version) assertEquals(10.0, dto.vulnerabilities.first().severity) } }