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

Support FULL_JDK directive in diagnostic tests

Browse Source
This commit is contained in:
Alexander Udalov
2017-07-31 13:01:14 -07:00
parent 7601666ec0
commit 8db736e2b4
8 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTest
@Override
protected void doMultiFileTest(File file, Map<String, ModuleAndDependencies> modules, List<Void> files) throws IOException {
KotlinCoreEnvironment environment = createEnvironment();
KotlinCoreEnvironment environment = createEnvironment(file);
File expectedFile = KotlinTestUtils.replaceExtension(file, "java");
LightClassTestCommon.INSTANCE.testLightClass(expectedFile, file, s -> {
try {
compiler/tests/org/jetbrains/kotlin/cfg/AbstractDiagnosticsWithModifiedMockJdkTest.java
+3 -1
View File
@@ -21,6 +21,8 @@ import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.TestJdkKind;
import java.io.File;
public abstract class AbstractDiagnosticsWithModifiedMockJdkTest extends AbstractDiagnosticsTest {
@NotNull
@Override
@@ -30,7 +32,7 @@ public abstract class AbstractDiagnosticsWithModifiedMockJdkTest extends Abstrac
@NotNull
@Override
protected TestJdkKind getTestJdkKind() {
protected TestJdkKind getTestJdkKind(@NotNull File file) {
return TestJdkKind.MODIFIED_MOCK_JDK;
}
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java
+3 -1
View File
@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.TestJdkKind;
import java.io.File;
public abstract class AbstractDiagnosticsWithFullJdkTest extends AbstractDiagnosticsTest {
@NotNull
@Override
@@ -29,7 +31,7 @@ public abstract class AbstractDiagnosticsWithFullJdkTest extends AbstractDiagnos
@NotNull
@Override
protected TestJdkKind getTestJdkKind() {
protected TestJdkKind getTestJdkKind(@NotNull File file) {
return TestJdkKind.FULL_JDK;
}
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk9Test.java
+1 -1
View File
@@ -34,7 +34,7 @@ public abstract class AbstractDiagnosticsWithJdk9Test extends AbstractDiagnostic
@NotNull
@Override
protected TestJdkKind getTestJdkKind() {
protected TestJdkKind getTestJdkKind(@NotNull File file) {
return TestJdkKind.FULL_JDK_9;
}