Skip to content

Commit 8616722

Browse files
dimonchik0036Space Team
authored andcommitted
[psi] move PsiKDocCoverageTest to api module
^KT-78613
1 parent b7f2bc6 commit 8616722

File tree

9 files changed

+30
-26
lines changed

9 files changed

+30
-26
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
/compiler/testData/parseCodeFragment/ @JetBrains/kotlin-frontend
160160
/compiler/testData/psi/ @JetBrains/kotlin-frontend
161161
/compiler/testData/psiUtil/ @JetBrains/kotlin-frontend
162-
/compiler/testData/psiKdocCoverage/ @JetBrains/kotlin-analysis-api
163162
/compiler/testData/recursiveProcessor/ @JetBrains/kotlin-frontend
164163
/compiler/testData/reflection/ @JetBrains/kotlin-libraries [email protected]
165164
/compiler/testData/repl/ @JetBrains/kotlin-frontend
@@ -178,8 +177,6 @@
178177
/compiler/testData/type-checker-test.kt @JetBrains/kotlin-frontend
179178
/compiler/testData/type-substitutor.kt @JetBrains/kotlin-frontend
180179
/compiler/tests/ @JetBrains/kotlin-frontend @JetBrains/kotlin-jvm @JetBrains/kotlin-native @JetBrains/kotlin-wasm @JetBrains/kotlin-common-backend @JetBrains/kotlin-js
181-
/compiler/tests/org/jetbrains/kotlin/psi/PsiKDocCoverageTest.kt @JetBrains/kotlin-analysis-api
182-
/compiler/tests/org/jetbrains/kotlin/util/KDocCoverageTest.kt @JetBrains/kotlin-analysis-api
183180
/compiler/tests-against-klib/ @JetBrains/kotlin-jvm
184181
/compiler/tests-common/ @JetBrains/kotlin-frontend @JetBrains/kotlin-jvm @JetBrains/kotlin-native @JetBrains/kotlin-wasm @JetBrains/kotlin-common-backend @JetBrains/kotlin-js
185182
/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/ @JetBrains/kotlin-analysis-api

.idea/runConfigurations/Check_PSI_KDoc_Coverage.xml

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.space/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
/compiler/testData/parseCodeFragment/ "Kotlin Frontend"
194194
/compiler/testData/psi/ "Kotlin Frontend"
195195
/compiler/testData/psiUtil/ "Kotlin Frontend"
196-
/compiler/testData/psiKdocCoverage/ "Kotlin Analysis API"
197196
/compiler/testData/recursiveProcessor/ "Kotlin Frontend"
198197
/compiler/testData/reflection/ "Kotlin Libraries" [email protected]
199198
/compiler/testData/repl/ "Kotlin Frontend"
@@ -212,8 +211,6 @@
212211
/compiler/testData/type-checker-test.kt "Kotlin Frontend"
213212
/compiler/testData/type-substitutor.kt "Kotlin Frontend"
214213
/compiler/tests/ "Kotlin Frontend" "Kotlin JVM" "Kotlin Native" "Kotlin Wasm" "Kotlin Common Backend" "Kotlin JS"
215-
/compiler/tests/org/jetbrains/kotlin/psi/PsiKDocCoverageTest.kt "Kotlin Analysis API"
216-
/compiler/tests/org/jetbrains/kotlin/util/KDocCoverageTest.kt "Kotlin Analysis API"
217214
/compiler/tests-against-klib/ "Kotlin JVM"
218215
/compiler/tests-common/ "Kotlin Frontend" "Kotlin JVM" "Kotlin Native" "Kotlin Wasm" "Kotlin Common Backend" "Kotlin JS"
219216
/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/ "Kotlin Analysis API"

analysis/analysis-api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dependencies {
2828
testApi(platform(libs.junit.bom))
2929
testImplementation(libs.junit.jupiter.api)
3030
testRuntimeOnly(libs.junit.jupiter.engine)
31+
3132
testImplementation(projectTests(":compiler:psi:psi-api"))
3233
testImplementation(projectTests(":compiler"))
3334
}

analysis/analysis-api/tests/org/jetbrains/kotlin/analysis/api/test/AnalysisApiKDocCoverageTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
package org.jetbrains.kotlin.analysis.api.test
77

8-
import org.jetbrains.kotlin.util.KDocCoverageTest
8+
import org.jetbrains.kotlin.AbstractKDocCoverageTest
99
import org.junit.jupiter.api.Test
1010

11-
class AnalysisApiKDocCoverageTest : KDocCoverageTest() {
11+
class AnalysisApiKDocCoverageTest : AbstractKDocCoverageTest() {
1212
override val sourceDirectories: List<DocumentationLocations> = listOf(
1313
DocumentationLocations(
14-
listOf("/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api"),
15-
"/analysis/analysis-api/api/analysis-api.undocumented"
14+
listOf("analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api"),
15+
"analysis/analysis-api/api/analysis-api.undocumented",
1616
),
1717
DocumentationLocations(
18-
listOf("/analysis/analysis-api-platform-interface/src/org/jetbrains/kotlin/analysis/api/platform"),
19-
"/analysis/analysis-api/api/analysis-api-platform-interface.undocumented"
18+
listOf("analysis/analysis-api-platform-interface/src/org/jetbrains/kotlin/analysis/api/platform"),
19+
"analysis/analysis-api/api/analysis-api-platform-interface.undocumented",
2020
),
2121
)
2222

File renamed without changes.

compiler/psi/psi-api/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ dependencies {
1717
testApi(platform(libs.junit.bom))
1818
testImplementation(libs.junit.jupiter.api)
1919
testRuntimeOnly(libs.junit.jupiter.engine)
20+
21+
testImplementation(projectTests(":compiler"))
2022
}
2123

2224
sourceSets {

compiler/tests/org/jetbrains/kotlin/util/KDocCoverageTest.kt renamed to compiler/psi/psi-api/tests/org/jetbrains/kotlin/AbstractKDocCoverageTest.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
package org.jetbrains.kotlin.util
6+
package org.jetbrains.kotlin
77

88
import com.intellij.lang.jvm.JvmModifier
99
import com.intellij.openapi.vfs.StandardFileSystems
@@ -40,7 +40,8 @@ import java.io.File
4040
* If the lack of documentation for some declaration is intentional,
4141
* the developer has to manually add this declaration to the master file.
4242
*/
43-
abstract class KDocCoverageTest : KtUsefulTestCase() {
43+
abstract class AbstractKDocCoverageTest : KtUsefulTestCase() {
44+
@OptIn(K1Deprecation::class)
4445
protected fun doTest() {
4546
val environment = KotlinCoreEnvironment.createForParallelTests(
4647
testRootDisposable,
@@ -52,7 +53,7 @@ abstract class KDocCoverageTest : KtUsefulTestCase() {
5253
val homeDir = KtTestUtil.getHomeDirectory()
5354

5455
sourceDirectories.forEach { (sourceCodeDirectoryPaths, outputFilePath) ->
55-
val roots = sourceCodeDirectoryPaths.map { File(homeDir + it) }
56+
val roots = sourceCodeDirectoryPaths.map { File(homeDir, it) }
5657

5758
val actualText = buildList {
5859
for (root in roots) {
@@ -79,7 +80,7 @@ abstract class KDocCoverageTest : KtUsefulTestCase() {
7980
}
8081
}.sorted().joinToString("\n")
8182

82-
val expectedFile = File(homeDir + outputFilePath)
83+
val expectedFile = File(homeDir, outputFilePath)
8384
KotlinTestUtils.assertEqualsToFile(
8485
"Some newer public declarations from `$roots` are undocumented. Please, consider either documenting them or adding them to `$outputFilePath`",
8586
expectedFile,

compiler/tests/org/jetbrains/kotlin/psi/PsiKDocCoverageTest.kt renamed to compiler/psi/psi-api/tests/org/jetbrains/kotlin/psi/PsiKDocCoverageTest.kt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55

66
package org.jetbrains.kotlin.psi
77

8+
import org.jetbrains.kotlin.AbstractKDocCoverageTest
89
import org.jetbrains.kotlin.name.FqName
9-
import org.jetbrains.kotlin.util.KDocCoverageTest
10+
import org.junit.jupiter.api.Test
1011

11-
class PsiKDocCoverageTest() : KDocCoverageTest() {
12+
class PsiKDocCoverageTest : AbstractKDocCoverageTest() {
1213
override val sourceDirectories: List<DocumentationLocations> = listOf(
1314
DocumentationLocations(
1415
listOf(
15-
"/compiler/psi/psi-api/src/org/jetbrains/kotlin",
16-
"/compiler/psi/psi-impl/src/org/jetbrains/kotlin",
17-
"/compiler/psi/psi-utils/src/org/jetbrains/kotlin",
18-
"/compiler/psi/psi-frontend-utils/src/org/jetbrains/kotlin",
16+
"compiler/psi/psi-api/src/org/jetbrains/kotlin",
17+
"compiler/psi/psi-impl/src/org/jetbrains/kotlin",
18+
"compiler/psi/psi-utils/src/org/jetbrains/kotlin",
19+
"compiler/psi/psi-frontend-utils/src/org/jetbrains/kotlin",
1920
),
20-
"/compiler/testData/psiKdocCoverage/psi.undocumented")
21+
"compiler/psi/psi-api/api/psi.undocumented",
22+
)
2123
)
2224

2325
override val ignoredPackages: List<FqName> = listOf(
@@ -28,7 +30,8 @@ class PsiKDocCoverageTest() : KDocCoverageTest() {
2830
FqName("org.jetbrains.kotlin.kdoc.parser"),
2931
)
3032

33+
@Test
3134
fun testKDocCoverage() {
3235
doTest()
3336
}
34-
}
37+
}

0 commit comments

Comments
 (0)