azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch rest of test to new scheme with configuration kind processing

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-02-27 14:56:19 +01:00
parent 46397dca4a
commit 32bcab2867
15 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/cfg/AbstractDiagnosticsWithModifiedMockJdkTest.kt
-5
View File
@@ -16,14 +16,9 @@
package org.jetbrains.kotlin.cfg
import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.TestJdkKind
abstract class AbstractDiagnosticsWithModifiedMockJdkTest : AbstractDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind {
return ConfigurationKind.ALL
}
override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
return TestJdkKind.MODIFIED_MOCK_JDK
}
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt
+2 -1
View File
@@ -8,7 +8,8 @@ import org.jetbrains.kotlin.test.ConfigurationKind
import java.io.File
abstract class AbstractDiagnosticsTestWithStdLib : AbstractDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind {
override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
return ConfigurationKind.NO_KOTLIN_REFLECT
}
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithExplicitApi.kt
-4
View File
@@ -9,10 +9,6 @@ import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.test.ConfigurationKind
abstract class AbstractDiagnosticsWithExplicitApi : AbstractDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind {
return ConfigurationKind.NO_KOTLIN_REFLECT
}
override fun defaultLanguageVersionSettings(): LanguageVersionSettings =
CompilerTestLanguageVersionSettings(
DEFAULT_DIAGNOSTIC_TESTS_FEATURES,
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk9Test.kt
-2
View File
@@ -15,11 +15,9 @@
*/
package org.jetbrains.kotlin.checkers
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.TestJdkKind
abstract class AbstractDiagnosticsWithJdk9Test : AbstractDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind = ConfigurationKind.ALL
override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
return TestJdkKind.FULL_JDK_9
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithUnsignedTypes.kt
+2 -1
View File
@@ -12,7 +12,8 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.test.ConfigurationKind
abstract class AbstractDiagnosticsWithUnsignedTypes : AbstractDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind {
override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
return ConfigurationKind.NO_KOTLIN_REFLECT
}
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt
-2
View File
@@ -52,8 +52,6 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() {
ForTestCompileRuntime.jvmAnnotationsForTests()
)
override fun getConfigurationKind(): ConfigurationKind = ConfigurationKind.ALL
open protected val annotationsPath: String
get() = FOREIGN_ANNOTATIONS_SOURCES_PATH
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
-2
View File
@@ -79,8 +79,6 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
setupEnvironment(environment)
}
protected open fun getConfigurationKind() = ConfigurationKind.JDK_ONLY
private fun getClasspath(file: File): List<File> {
val result: MutableList<File> = ArrayList()
result.add(KotlinTestUtils.getAnnotationsJar())
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.test.ConfigurationKind
abstract class AbstractFirOldFrontendDiagnosticsTestWithStdlib : AbstractFirOldFrontendDiagnosticsTest() {
override fun getConfigurationKind(): ConfigurationKind {
override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
return ConfigurationKind.NO_KOTLIN_REFLECT
}
}