diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt index d292208116a..3acfe4b8486 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (jet.String?, jet.String?) -> jet.Int): test.SubstitutedSamInterface +public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (jet.String, jet.String) -> jet.Int): test.SubstitutedSamInterface public trait SubstitutedSamInterface : java.util.Comparator { - public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: jet.String?, /*1*/ p1: jet.String?): jet.Int + public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: jet.String, /*1*/ p1: jet.String): jet.Int } diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt index b23b5d30ba7..ae0ee667381 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt @@ -2,8 +2,8 @@ package test public open class NonTrivialFunctionType : java.lang.Object { public constructor NonTrivialFunctionType() - public open /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File?, jet.String?) -> jet.Boolean)?): jet.Unit - public open /*synthesized*/ fun foo(/*0*/ p0: ((jet.String?, jet.String?) -> jet.Int)?): jet.Unit + public open /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, jet.String) -> jet.Boolean)?): jet.Unit + public open /*synthesized*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit public open fun foo(/*0*/ p0: java.io.FilenameFilter?): jet.Unit public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit public open /*synthesized*/ fun wildcardBound(/*0*/ p0: ((jet.CharSequence?, jet.CharSequence?) -> jet.Int)?): jet.Unit diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt index 916e51aeea5..57b5508fe52 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt @@ -5,6 +5,6 @@ public open class SeveralSamParameters : java.lang.Object { } package SeveralSamParameters { - public open /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((jet.String?, jet.String?) -> jet.Int)?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: (() -> jet.Unit)?): jet.String? + public open /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: (() -> jet.Unit)?): jet.String? public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: java.lang.Runnable?): jet.String? } diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt index cc5c4dfc788..aad57e1da24 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt @@ -2,6 +2,6 @@ package test public open class TypeParameterOfClass : java.lang.Object { public constructor TypeParameterOfClass() - public open /*synthesized*/ fun foo(/*0*/ p0: ((T?, T?) -> jet.Int)?): jet.Unit + public open /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit } diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt index 2e821387723..bacb260964b 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt @@ -5,10 +5,10 @@ public open class TypeParameterOfMethod : java.lang.Object { } package TypeParameterOfMethod { - public open /*synthesized*/ fun max(/*0*/ p0: ((T?, T?) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? + public open /*synthesized*/ fun max(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? public open fun max(/*0*/ p0: java.util.Comparator?, /*1*/ p1: T?, /*2*/ p2: T?): T? - public open /*synthesized*/ fun max2(/*0*/ p0: ((T?, T?) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? + public open /*synthesized*/ fun max2(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? public open fun max2(/*0*/ p0: java.util.Comparator?, /*1*/ p1: T?, /*2*/ p2: T?): T? - public open /*synthesized*/ fun ?> method(/*0*/ p0: ((A?, A?) -> jet.Int)?, /*1*/ p1: B?): jet.Unit + public open /*synthesized*/ fun ?> method(/*0*/ p0: ((A, A) -> jet.Int)?, /*1*/ p1: B?): jet.Unit public open fun ?> method(/*0*/ p0: java.util.Comparator?, /*1*/ p1: B?): jet.Unit } diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt index e60128de6e3..1dbb3b17d9f 100644 --- a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt @@ -5,7 +5,7 @@ public open class TypeParameterOfOuterClass : java.lang.Object { public open inner class Inner : java.lang.Object { public constructor Inner() - public open /*synthesized*/ fun foo(/*0*/ p0: ((T?, T?) -> jet.Int)?): jet.Unit + public open /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt index a95fecff97c..aa7593a1b17 100644 --- a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt +++ b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt @@ -2,10 +2,10 @@ package test public final class ClassWithObjectMethod : java.lang.Object { public constructor ClassWithObjectMethod() - protected open override /*1*/ /*fake_override*/ fun clone(): jet.Any? + protected open override /*1*/ /*fake_override*/ fun clone(): jet.Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean protected open override /*1*/ /*fake_override*/ fun finalize(): jet.Unit - public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class? + public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class public open override /*1*/ /*fake_override*/ fun hashCode(): jet.Int public final override /*1*/ /*fake_override*/ fun notify(): jet.Unit public final override /*1*/ /*fake_override*/ fun notifyAll(): jet.Unit diff --git a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt index c8290deabe3..c725e868a1d 100644 --- a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt +++ b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt @@ -4,7 +4,7 @@ public trait InterfaceWithObjectMethods : java.lang.Object { public abstract override /*1*/ fun clone(): jet.Any? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean public abstract override /*1*/ fun finalize(): jet.Unit - public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class? + public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class public open override /*1*/ /*fake_override*/ fun hashCode(): jet.Int public final override /*1*/ /*fake_override*/ fun notify(): jet.Unit public final override /*1*/ /*fake_override*/ fun notifyAll(): jet.Unit diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 784f7402d6f..4238ec7c513 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -67,7 +67,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File txtFile = getTxtFile(javaFile.getPath()); NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); Pair javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( - Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); + Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL); checkLoadedNamespaces(txtFile, kotlinNamespace, javaNamespaceAndContext.first, javaNamespaceAndContext.second); } @@ -105,7 +105,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { getTestRootDisposable(), ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.MOCK_JDK); Pair javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( - srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); + srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.ALL); checkJavaNamespace(getTxtFile(javaFileName), javaNamespaceAndContext.first, javaNamespaceAndContext.second, configuration); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 6e32282bec7..3c838d8b170 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -94,7 +94,6 @@ public final class LoadDescriptorUtil { CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( configurationKind, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), javaRoot, - ForTestCompileRuntime.runtimeJarForTests(), new File("compiler/tests") // for @ExpectLoadError annotation ); JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration);