From 4474005183e5ba081e68ac1e613f31aa11ef7b61 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 3 Apr 2015 01:38:31 +0300 Subject: [PATCH] Fix codegen tests and overloads diagnostic test --- .../annotations/jvmOverloads/jvmOverloadsOnPrivate.txt | 1 + .../kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt index b05bf25a16d..445b042749e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt @@ -4,6 +4,7 @@ internal fun foo(): kotlin.Unit internal final class C { public constructor C() + kotlin.jvm.overloads() internal final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.jvm.overloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index d2d24a2ec7a..c9bb56e9f91 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -142,7 +142,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { }); CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.ALL, getTestJdkKind(directory), JetTestUtils.getAnnotationsJar() + ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar() ); addJvmClasspathRoot(configuration, dirFile); myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);