From 7f60cd81fe26a05447efa5885683249c7dad35bf Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 30 Mar 2021 17:00:09 +0300 Subject: [PATCH] CodeConformanceTest for no Bintray except jcenter (KTI-528) --- .../tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 13f67f5e839..77a9d37b9e4 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -294,7 +294,7 @@ class CodeConformanceTest : TestCase() { } fun testRepositoriesAbuse() { - class RepoAllowList(val repo: String, root: File, allowList: Set) { + class RepoAllowList(val repo: String, root: File, allowList: Set, val exclude: String? = null) { val matcher = FileMatcher(root, allowList) } @@ -320,8 +320,7 @@ class CodeConformanceTest : TestCase() { setOf("gradle/cacheRedirector.gradle.kts") ), RepoAllowList("kotlin/ktor", root, setOf("gradle/cacheRedirector.gradle.kts")), - RepoAllowList("bintray.com/kotlin-dependencies", root, setOf("gradle/cacheRedirector.gradle.kts")), - RepoAllowList("api.bintray.com/maven/kotlin/kotlin-dependencies", root, setOf()) + RepoAllowList("bintray.com", root, setOf("gradle/cacheRedirector.gradle.kts"), exclude = "jcenter.bintray.com") ) data class RepoOccurance(val repo: String, val file: File) @@ -339,7 +338,7 @@ class CodeConformanceTest : TestCase() { file.useLines { lines -> for (line in lines) { for (checker in checkers) { - if (line.contains(checker.repo)) { + if (line.contains(checker.repo) && (checker.exclude == null || !line.contains(checker.exclude))) { occurrences.add(RepoOccurance(checker.repo, file)) } }