Skip to content

Commit 4d107cb

Browse files
committed
test(version-control-systems): Move assets to resources
This is part of #8589. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 32afce4 commit 4d107cb

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

plugins/version-control-systems/mercurial/src/funTest/kotlin/MercurialWorkingTreeFunTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package org.ossreviewtoolkit.plugins.versioncontrolsystems.mercurial
2121

2222
import io.kotest.core.spec.style.StringSpec
2323
import io.kotest.engine.spec.tempdir
24+
import io.kotest.engine.spec.tempfile
2425
import io.kotest.matchers.maps.beEmpty as beEmptyMap
2526
import io.kotest.matchers.should
2627
import io.kotest.matchers.shouldBe
@@ -29,16 +30,16 @@ import io.kotest.matchers.string.beEmpty
2930

3031
import org.ossreviewtoolkit.model.VcsInfo
3132
import org.ossreviewtoolkit.model.VcsType
33+
import org.ossreviewtoolkit.utils.common.extractResource
3234
import org.ossreviewtoolkit.utils.common.unpack
3335
import org.ossreviewtoolkit.utils.ort.ortDataDirectory
34-
import org.ossreviewtoolkit.utils.test.getAssetFile
3536

3637
class MercurialWorkingTreeFunTest : StringSpec({
3738
val hg = Mercurial()
3839
val zipContentDir = tempdir()
3940

4041
beforeSpec {
41-
val zipFile = getAssetFile("lz4revlog-2018-01-03-hg.zip")
42+
val zipFile = extractResource("/lz4revlog-2018-01-03-hg.zip", tempfile(suffix = ".zip"))
4243
zipFile.unpack(zipContentDir)
4344
}
4445

plugins/version-control-systems/subversion/src/funTest/kotlin/SubversionWorkingTreeFunTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package org.ossreviewtoolkit.plugins.versioncontrolsystems.subversion
2121

2222
import io.kotest.core.spec.style.StringSpec
2323
import io.kotest.engine.spec.tempdir
24+
import io.kotest.engine.spec.tempfile
2425
import io.kotest.matchers.collections.shouldContainAll
2526
import io.kotest.matchers.maps.beEmpty as beEmptyMap
2627
import io.kotest.matchers.should
@@ -30,16 +31,16 @@ import io.kotest.matchers.string.beEmpty
3031

3132
import org.ossreviewtoolkit.model.VcsInfo
3233
import org.ossreviewtoolkit.model.VcsType
34+
import org.ossreviewtoolkit.utils.common.extractResource
3335
import org.ossreviewtoolkit.utils.common.unpack
3436
import org.ossreviewtoolkit.utils.ort.ortDataDirectory
35-
import org.ossreviewtoolkit.utils.test.getAssetFile
3637

3738
class SubversionWorkingTreeFunTest : StringSpec({
3839
val svn = Subversion()
3940
val zipContentDir = tempdir()
4041

4142
beforeSpec {
42-
val zipFile = getAssetFile("docutils-2018-01-03-svn-trunk.zip")
43+
val zipFile = extractResource("/docutils-2018-01-03-svn-trunk.zip", tempfile(suffix = ".zip"))
4344
zipFile.unpack(zipContentDir)
4445
}
4546

0 commit comments

Comments
 (0)