Add tests on foreign annotations without them in classpath

#KT-19419 Fixed
This commit is contained in:
Denis Zharkov
2017-08-10 13:17:23 +07:00
parent 8948023a26
commit 8898455352
11 changed files with 428 additions and 23 deletions
@@ -357,6 +357,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
testFiles: List<TestFile>,
modules: Map<TestModule?, ModuleDescriptorImpl>
) {
if (skipDescriptorsValidation()) return
if (testFiles.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT") }) {
assertFalse(".txt file should not exist if SKIP_TXT directive is used: $expectedFile", expectedFile.exists())
return
@@ -418,6 +419,8 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
KotlinTestUtils.assertEqualsToFile(expectedFile, allPackagesText)
}
protected open fun skipDescriptorsValidation(): Boolean = false
private fun createdAffectedPackagesConfiguration(
testFiles: List<TestFile>,
modules: Collection<ModuleDescriptor>
@@ -40,7 +40,7 @@ import java.util.List;
import java.util.Map;
public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase {
private File javaFilesDir;
protected File javaFilesDir;
private File kotlinSourceRoot;
@Override
@@ -78,13 +78,28 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase
getConfigurationKind(),
getTestJdkKind(),
CollectionsKt.plus(Collections.singletonList(KotlinTestUtils.getAnnotationsJar()), getExtraClasspath()),
Collections.singletonList(javaFilesDir)
isJavaSourceRootNeeded() ? Collections.singletonList(javaFilesDir) : Collections.emptyList()
);
configuration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, StandardScriptDefinition.INSTANCE);
if (isKotlinSourceRootNeeded()) {
ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath());
}
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
KotlinCoreEnvironment environment =
KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
performCustomConfiguration(
environment
);
return environment;
}
protected boolean isJavaSourceRootNeeded() {
return true;
}
protected void performCustomConfiguration(@NotNull KotlinCoreEnvironment environment) {
}
@NotNull
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.codegen;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.io.FileUtil;
@@ -587,20 +586,6 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
}
}
@NotNull
protected static List<String> findJavaSourcesInDirectory(@NotNull File directory) {
List<String> javaFilePaths = new ArrayList<>(1);
FileUtil.processFilesRecursively(directory, file -> {
if (file.isFile() && FilesKt.getExtension(file).equals(JavaFileType.DEFAULT_EXTENSION)) {
javaFilePaths.add(file.getPath());
}
return true;
});
return javaFilePaths;
}
protected ConfigurationKind extractConfigurationKind(@NotNull List<TestFile> files) {
boolean addRuntime = false;
@@ -16,7 +16,10 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.util.io.FileUtil;
import kotlin.collections.CollectionsKt;
import kotlin.io.FilesKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -80,7 +83,22 @@ public class CodegenTestUtil {
@NotNull List<String> additionalOptions
) {
try {
File javaClassesTempDirectory = KotlinTestUtils.tmpDir("java-classes");
File directory = KotlinTestUtils.tmpDir("java-classes");
compileJava(fileNames, additionalClasspath, additionalOptions, directory);
return directory;
}
catch (IOException e) {
throw ExceptionUtilsKt.rethrow(e);
}
}
public static void compileJava(
@NotNull List<String> fileNames,
@NotNull List<String> additionalClasspath,
@NotNull List<String> additionalOptions,
@NotNull File outDirectory
) {
try {
List<String> classpath = new ArrayList<>();
classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath());
classpath.add(ForTestCompileRuntime.reflectJarForTests().getPath());
@@ -89,13 +107,11 @@ public class CodegenTestUtil {
List<String> options = new ArrayList<>(Arrays.asList(
"-classpath", StringsKt.join(classpath, File.pathSeparator),
"-d", javaClassesTempDirectory.getPath()
"-d", outDirectory.getPath()
));
options.addAll(additionalOptions);
KotlinTestUtils.compileJavaFiles(CollectionsKt.map(fileNames, File::new), options);
return javaClassesTempDirectory;
}
catch (IOException e) {
throw ExceptionUtilsKt.rethrow(e);
@@ -131,4 +147,18 @@ public class CodegenTestUtil {
throw ExceptionUtilsKt.rethrow(e);
}
}
@NotNull
public static List<String> findJavaSourcesInDirectory(@NotNull File directory) {
List<String> javaFilePaths = new ArrayList<>(1);
FileUtil.processFilesRecursively(directory, file -> {
if (file.isFile() && FilesKt.getExtension(file).equals(JavaFileType.DEFAULT_EXTENSION)) {
javaFilePaths.add(file.getPath());
}
return true;
});
return javaFilePaths;
}
}