diff --git a/compiler/testData/compileJavaAgainstKotlin/sealed/Derived.txt b/compiler/testData/compileJavaAgainstKotlin/sealed/Derived.txt deleted file mode 100644 index a054a8fe789..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/sealed/Derived.txt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -public sealed class Season { - private constructor Season() - - public final class Cold : test.Season { - public constructor Cold() - } - - public final class Warm : test.Season { - public constructor Warm() - } -} diff --git a/compiler/testData/compileJavaAgainstKotlin/sealed/Instance.txt b/compiler/testData/compileJavaAgainstKotlin/sealed/Instance.txt deleted file mode 100644 index a054a8fe789..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/sealed/Instance.txt +++ /dev/null @@ -1,13 +0,0 @@ -package test - -public sealed class Season { - private constructor Season() - - public final class Cold : test.Season { - public constructor Cold() - } - - public final class Warm : test.Season { - public constructor Warm() - } -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt deleted file mode 100644 index bec9aab3d35..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -@test.meta public/*package*/ final annotation class MyAnn : kotlin.Annotation { - public/*package*/ constructor MyAnn() -} - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class meta : kotlin.Annotation { - public constructor meta() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt deleted file mode 100644 index c711308bb61..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class classifier : kotlin.Annotation { - public constructor classifier() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt deleted file mode 100644 index f90171d8094..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class constructor : kotlin.Annotation { - public constructor constructor() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt b/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt deleted file mode 100644 index ce0d54a407e..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {}) public final annotation class empty : kotlin.Annotation { - public constructor empty() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt b/compiler/testData/compileJavaAgainstKotlin/targets/field.txt deleted file mode 100644 index e554e509478..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final annotation class field : kotlin.Annotation { - public constructor field() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt b/compiler/testData/compileJavaAgainstKotlin/targets/function.txt deleted file mode 100644 index f9219a9c1ca..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class function : kotlin.Annotation { - public constructor function() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt deleted file mode 100644 index d7a170d22ff..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) public final annotation class getter : kotlin.Annotation { - public constructor getter() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt b/compiler/testData/compileJavaAgainstKotlin/targets/local.txt deleted file mode 100644 index 3420731824c..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class local : kotlin.Annotation { - public constructor local() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt deleted file mode 100644 index f46c55da0d6..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION}) public final annotation class multiple : kotlin.Annotation { - public constructor multiple() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt deleted file mode 100644 index 4a9fd968571..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class parameter : kotlin.Annotation { - public constructor parameter() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt b/compiler/testData/compileJavaAgainstKotlin/targets/property.txt deleted file mode 100644 index a1c305559f7..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) public final annotation class property : kotlin.Annotation { - public constructor property() -} diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt deleted file mode 100644 index e136a7d67ab..00000000000 --- a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) public final annotation class setter : kotlin.Annotation { - public constructor setter() -} diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index 660ed06d52d..19a6e08a2a6 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -552,7 +552,7 @@ public class KotlinTestUtils { } } - public static void compileKotlinWithJava( + public static boolean compileKotlinWithJava( @NotNull List javaFiles, @NotNull List ktFiles, @NotNull File outDir, @@ -567,12 +567,12 @@ public class KotlinTestUtils { boolean mkdirs = outDir.mkdirs(); assert mkdirs : "Not created: " + outDir; } - if (!javaFiles.isEmpty()) { - compileJavaFiles(javaFiles, Arrays.asList( - "-classpath", outDir.getPath() + File.pathSeparator + ForTestCompileRuntime.runtimeJarForTests(), - "-d", outDir.getPath() - ), javaErrorFile); - } + if (javaFiles.isEmpty()) return true; + + return compileJavaFiles(javaFiles, Arrays.asList( + "-classpath", outDir.getPath() + File.pathSeparator + ForTestCompileRuntime.runtimeJarForTests(), + "-d", outDir.getPath() + ), javaErrorFile); } public interface TestFileFactory { @@ -802,11 +802,11 @@ public class KotlinTestUtils { return comments; } - public static void compileJavaFiles(@NotNull Collection files, List options) throws IOException { - compileJavaFiles(files, options, null); + public static boolean compileJavaFiles(@NotNull Collection files, List options) throws IOException { + return compileJavaFiles(files, options, null); } - public static void compileJavaFiles(@NotNull Collection files, List options, @Nullable File javaErrorFile) throws IOException { + private static boolean compileJavaFiles(@NotNull Collection files, List options, @Nullable File javaErrorFile) throws IOException { JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler(); DiagnosticCollector diagnosticCollector = new DiagnosticCollector(); StandardJavaFileManager fileManager = javaCompiler.getStandardFileManager(diagnosticCollector, Locale.ENGLISH, Charset.forName("utf-8")); @@ -828,13 +828,14 @@ public class KotlinTestUtils { else { assertEqualsToFile(javaErrorFile, errorsToString(diagnosticCollector, false)); } + return success; } finally { fileManager.close(); } } @NotNull - private static String errorsToString(@NotNull DiagnosticCollector diagnosticCollector, boolean humanReadable) { + private static String errorsToString(@NotNull DiagnosticCollector diagnosticCollector, boolean humanReadable) { StringBuilder builder = new StringBuilder(); for (javax.tools.Diagnostic diagnostic : diagnosticCollector.getDiagnostics()) { if (diagnostic.getKind() != javax.tools.Diagnostic.Kind.ERROR) continue; @@ -843,7 +844,7 @@ public class KotlinTestUtils { builder.append(diagnostic).append("\n"); } else { - builder.append(diagnostic.getSource().getName()).append(":") + builder.append(new File(diagnostic.getSource().toUri()).getName()).append(":") .append(diagnostic.getLineNumber()).append(":") .append(diagnostic.getColumnNumber()).append(":") .append(diagnostic.getCode()).append("\n"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index bd914f89fdd..6715a820189 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -65,12 +65,13 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT Assert.assertTrue(ktFilePath.endsWith(".kt")); File ktFile = new File(ktFilePath); File javaFile = new File(ktFilePath.replaceFirst("\\.kt$", ".java")); - File expectedFile = new File(ktFilePath.replaceFirst("\\.kt$", ".txt")); File javaErrorFile = new File(ktFilePath.replaceFirst("\\.kt$", ".javaerr.txt")); File out = new File(tmpdir, "out"); - compileKotlinWithJava(Collections.singletonList(javaFile), Collections.singletonList(ktFile), - out, getTestRootDisposable(), javaErrorFile); + boolean compiledSuccessfully = + compileKotlinWithJava(Collections.singletonList(javaFile), Collections.singletonList(ktFile), + out, getTestRootDisposable(), javaErrorFile); + if (!compiledSuccessfully) return; KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), @@ -82,6 +83,7 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT PackageViewDescriptor packageView = analysisResult.getModuleDescriptor().getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME); assertFalse("Nothing found in package " + LoadDescriptorUtil.TEST_PACKAGE_FQNAME, packageView.isEmpty()); + File expectedFile = new File(ktFilePath.replaceFirst("\\.kt$", ".txt")); validateAndCompareDescriptorWithFile(packageView, CONFIGURATION, expectedFile); } }