Skip to content

Commit 994d437

Browse files
committed
test(scanner): Move assets to resources
This is part of #8589. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 899e4be commit 994d437

26 files changed

+41
-43
lines changed

plugins/scanners/scancode/src/test/kotlin/ScanCodeResultParserTest.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ import io.kotest.matchers.should
2828
import io.kotest.matchers.shouldBe
2929
import io.kotest.matchers.string.shouldStartWith
3030

31-
import java.io.File
3231
import java.time.Instant
3332

3433
import org.ossreviewtoolkit.model.Issue
3534
import org.ossreviewtoolkit.model.LicenseFinding
3635
import org.ossreviewtoolkit.model.ScanSummary
3736
import org.ossreviewtoolkit.model.Severity
3837
import org.ossreviewtoolkit.model.TextLocation
38+
import org.ossreviewtoolkit.utils.test.readResource
3939
import org.ossreviewtoolkit.utils.test.transformingCollectionMatcher
4040

4141
class ScanCodeResultParserTest : FreeSpec({
4242
"generateSummary()" - {
4343
"for ScanCode 32.0.8 should" - {
4444
"get license mappings even without '--license-references'" {
45-
val resultFile = getAssetFile("scancode-32.0.8_spdx-expression-parse_no-license-references.json")
45+
val result = readResource("/scancode-32.0.8_spdx-expression-parse_no-license-references.json")
4646

47-
val summary = parseResult(resultFile).toScanSummary()
47+
val summary = parseResult(result).toScanSummary()
4848

4949
with(summary.licenseFindings) {
5050
shouldHaveSize(18)
@@ -54,9 +54,9 @@ class ScanCodeResultParserTest : FreeSpec({
5454
}
5555

5656
"get file-level findings with the 'preferFileLicense' option" {
57-
val resultFile = getAssetFile("scancode-32.0.8_spdx-expression-parse_no-license-references.json")
57+
val result = readResource("/scancode-32.0.8_spdx-expression-parse_no-license-references.json")
5858

59-
val summary = parseResult(resultFile).toScanSummary(preferFileLicense = true)
59+
val summary = parseResult(result).toScanSummary(preferFileLicense = true)
6060

6161
summary.licenseFindings.map { it.license.toString() } should containExactlyInAnyOrder(
6262
"LicenseRef-scancode-generic-cla AND MIT",
@@ -70,9 +70,9 @@ class ScanCodeResultParserTest : FreeSpec({
7070

7171
"for ScanCode 32.1.0 should" - {
7272
"contain findings that stem from referenced files" {
73-
val resultFile = getAssetFile("scancode-32.1.0_from_file-reference.json")
73+
val result = readResource("/scancode-32.1.0_from_file-reference.json")
7474

75-
val summary = parseResult(resultFile).toScanSummary()
75+
val summary = parseResult(result).toScanSummary()
7676

7777
summary.licenseFindings should containExactlyInAnyOrder(
7878
LicenseFinding(
@@ -150,7 +150,7 @@ class ScanCodeResultParserTest : FreeSpec({
150150
}
151151

152152
for (version in 1..MAX_SUPPORTED_OUTPUT_FORMAT_MAJOR_VERSION) {
153-
val resultFile = getAssetFile("scancode-output-format-$version.0.0_mime-types-2.1.18.json")
153+
val resultFile = readResource("/scancode-output-format-$version.0.0_mime-types-2.1.18.json")
154154
val summary = parseResult(resultFile).toScanSummary()
155155

156156
"for output format $version.0.0 should" - {
@@ -255,5 +255,3 @@ private fun containCopyrightsExactly(vararg copyrights: Pair<String, List<TextLo
255255
summary.copyrightFindings.groupBy { it.statement }.entries
256256
.map { (key, value) -> key to value.map { it.location } }
257257
}
258-
259-
private fun getAssetFile(path: String): File = File("src/test/assets", path).absoluteFile

plugins/scanners/scancode/src/test/kotlin/ScanCodeTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import org.ossreviewtoolkit.model.PackageType
3737
import org.ossreviewtoolkit.model.ScannerDetails
3838
import org.ossreviewtoolkit.scanner.ScanContext
3939
import org.ossreviewtoolkit.utils.common.ProcessCapture
40+
import org.ossreviewtoolkit.utils.common.extractResource
41+
import org.ossreviewtoolkit.utils.test.readResource
4042

4143
class ScanCodeTest : WordSpec({
4244
val scanner = ScanCodeFactory.create()
@@ -86,9 +88,8 @@ class ScanCodeTest : WordSpec({
8688

8789
val scannerSpy = spyk(scanner)
8890
every { scannerSpy.runScanCode(any(), any()) } answers {
89-
val resultFile = File("src/test/assets/scancode-with-issues.json")
9091
val targetFile = secondArg<File>()
91-
resultFile.copyTo(targetFile)
92+
extractResource("/scancode-with-issues.json", targetFile)
9293

9394
process
9495
}
@@ -126,8 +127,7 @@ class ScanCodeTest : WordSpec({
126127

127128
"parseDetails()" should {
128129
"return details for a raw scan result" {
129-
val resultFile = File("src/test/assets/scancode-with-issues.json")
130-
val result = resultFile.readText()
130+
val result = readResource("/scancode-with-issues.json")
131131

132132
scanner.parseDetails(result) shouldBe ScannerDetails(
133133
name = "ScanCode",

plugins/scanners/scanoss/src/test/kotlin/ScanOssResultParserTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import io.kotest.matchers.collections.haveSize
2828
import io.kotest.matchers.collections.shouldContain
2929
import io.kotest.matchers.should
3030

31-
import java.io.File
3231
import java.time.Instant
3332

3433
import org.ossreviewtoolkit.model.CopyrightFinding
@@ -40,11 +39,12 @@ import org.ossreviewtoolkit.model.TextLocation
4039
import org.ossreviewtoolkit.model.VcsInfo
4140
import org.ossreviewtoolkit.model.VcsType
4241
import org.ossreviewtoolkit.utils.spdx.SpdxExpression
42+
import org.ossreviewtoolkit.utils.test.readResource
4343

4444
class ScanOssResultParserTest : WordSpec({
4545
"generateSummary()" should {
4646
"properly summarize JUnit 4.12 findings" {
47-
val results = File("src/test/assets/scanoss-junit-4.12.json").readText().let {
47+
val results = readResource("/scanoss-junit-4.12.json").let {
4848
JsonUtils.toScanFileResultsFromObject(JsonUtils.toJsonObject(it))
4949
}
5050

@@ -82,7 +82,7 @@ class ScanOssResultParserTest : WordSpec({
8282
}
8383

8484
"properly summarize Semver4j 3.1.0 with snippet findings" {
85-
val results = File("src/test/assets/scanoss-semver4j-3.1.0-with-snippet.json").readText().let {
85+
val results = readResource("/scanoss-semver4j-3.1.0-with-snippet.json").let {
8686
JsonUtils.toScanFileResultsFromObject(JsonUtils.toJsonObject(it))
8787
}
8888

0 commit comments

Comments
 (0)