chore(downloader): Generalize VCS directory filtering in tests

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Apr 25, 2024 · 7a46ed5 · 7a46ed5
1 parent c091056
commit 7a46ed5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/downloader/src/funTest/kotlin/DownloaderFunTest.kt b/downloader/src/funTest/kotlin/DownloaderFunTest.kt
@@ -306,7 +306,7 @@ class DownloaderFunTest : WordSpec({
 
             val provenance = Downloader(DownloaderConfiguration()).download(pkg, outputDir)
 
-            outputDir.walk().onEnter { it.name != ".svn" }.count() shouldBe 302
+            outputDir.walk().onEnter { it.name !in VCS_DIRECTORIES }.count() shouldBe 302
 
             provenance.shouldBeTypeOf<RepositoryProvenance>().apply {
                 vcsInfo.type shouldBe VcsType.SUBVERSION

diff --git a/plugins/version-control-systems/subversion/src/funTest/kotlin/SubversionDownloadFunTest.kt b/plugins/version-control-systems/subversion/src/funTest/kotlin/SubversionDownloadFunTest.kt
@@ -30,6 +30,7 @@ import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.VcsInfo
 import org.ossreviewtoolkit.model.VcsType
+import org.ossreviewtoolkit.utils.common.VCS_DIRECTORIES
 import org.ossreviewtoolkit.utils.test.ExpensiveTag
 
 private const val REPO_URL = "https://svn.code.sf.net/p/sendmessage/code"
@@ -79,7 +80,7 @@ class SubversionDownloadFunTest : StringSpec() {
 
             val workingTree = svn.download(pkg, outputDir)
             val actualFiles = workingTree.workingDir.walkBottomUp()
-                .onEnter { it.name != ".svn" }
+                .onEnter { it.name !in VCS_DIRECTORIES }
                 .filter { it.isFile }
                 .map { it.relativeTo(outputDir) }
                 .sortedBy { it.path }