From 947ab99f530702d13691aea985aa09735a9f111d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 7 Dec 2012 21:42:48 +0400 Subject: [PATCH] Tests fixed after default nullability for type arguments changed to NotNull --- ...TwoSuperclassesInconsistentGenericTypes.txt | 2 +- .../TwoSuperclassesVarargAndNot.java | 1 + .../SubclassWithRawType.txt | 18 +++++++++--------- .../jet/jvm/compiler/AbstractLoadJavaTest.java | 8 ++++++++ .../AnnotationJavaDescriptorResolverTest.java | 8 ++++---- .../jet/jvm/compiler/LoadJavaCustomTest.java | 5 ++--- .../javaParameters/foo/Impl.kt.after | 2 +- .../overrideJavaMethod/foo/Impl.kt.after | 2 +- 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt index 507ad3514f1..604e401f226 100644 --- a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt +++ b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt @@ -7,6 +7,6 @@ public abstract trait test.TwoSuperclassesInconsistentGenericTypes : java.lang.O } public open class test.TwoSuperclassesInconsistentGenericTypes.Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other { public final /*constructor*/ fun (): test.TwoSuperclassesInconsistentGenericTypes.Sub - public open override /*2*/ fun foo(): jet.MutableList + public open override /*2*/ fun foo(): jet.MutableList } } diff --git a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.java b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.java index 33668f708e2..b83471257f9 100644 --- a/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.java +++ b/compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.java @@ -14,6 +14,7 @@ public interface TwoSuperclassesVarargAndNot { } public interface Super2 { + @KotlinSignature("fun foo(s : Array?)") void foo(String[] s); } diff --git a/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt b/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt index d8e2d55881a..0d6b9378baf 100644 --- a/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt +++ b/compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt @@ -2,23 +2,23 @@ namespace test public abstract trait test.SubclassWithRawType : java.lang.Object { public abstract trait test.SubclassWithRawType.Sub : test.SubclassWithRawType.Super { - public abstract override /*1*/ fun array1(): jet.Array?>? - public abstract override /*1*/ fun array2(): jet.Array?>? + public abstract override /*1*/ fun array1(): jet.Array>? + public abstract override /*1*/ fun array2(): jet.Array>? public abstract override /*1*/ fun boundWildcard1(): jet.MutableList?>? - public abstract override /*1*/ fun boundWildcard2(): jet.MutableList?>? + public abstract override /*1*/ fun boundWildcard2(): jet.MutableList?>? public abstract override /*1*/ fun simple1(): jet.MutableList? - public abstract override /*1*/ fun simple2(): jet.MutableList?>? - public abstract override /*1*/ fun simple3(): jet.MutableList? + public abstract override /*1*/ fun simple2(): jet.MutableList?>? + public abstract override /*1*/ fun simple3(): jet.MutableList? public abstract override /*1*/ fun wildcard(): jet.MutableList? } public abstract trait test.SubclassWithRawType.Super : java.lang.Object { - public abstract fun array1(): jet.Array?>? - public abstract fun array2(): jet.Array?>? + public abstract fun array1(): jet.Array>? + public abstract fun array2(): jet.Array>? public abstract fun boundWildcard1(): jet.MutableList?>? - public abstract fun boundWildcard2(): jet.MutableList?>? + public abstract fun boundWildcard2(): jet.MutableList?>? public abstract fun simple1(): jet.MutableList? public abstract fun simple2(): jet.MutableList? - public abstract fun simple3(): jet.MutableList? + public abstract fun simple3(): jet.MutableList? public abstract fun wildcard(): jet.MutableList? } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 34035f63789..ce6d46fa28e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -50,6 +50,14 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { Pair nsbAndBindingContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( Arrays.asList(javaFile, ExpectedLoadErrorsUtil.ANNOTATION_SOURCE_FILE), tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); + checkLoadedNamespaces(txtFile, nsa, nsbAndBindingContext); + } + + public static void checkLoadedNamespaces( + File txtFile, + NamespaceDescriptor nsa, + Pair nsbAndBindingContext + ) { NamespaceDescriptor nsb = nsbAndBindingContext.first; boolean fail = false; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java index 49c124105b6..14a6bacef0d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java @@ -107,7 +107,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe actualCompileTimeConstant = getCompileTimeConstant(annotation2, annotationTypeName2, "value"); assert actualCompileTimeConstant instanceof AnnotationValue; checkAnnotationCompileTimeConstant((AnnotationValue) actualCompileTimeConstant, "value", - DEFAULT_PACKAGE + ".MyAnnotation2", "jet.Array?", "[\"test\", \"test2\"]"); + DEFAULT_PACKAGE + ".MyAnnotation2", "jet.Array?", "[\"test\", \"test2\"]"); String annotationTypeName3 = DEFAULT_PACKAGE + ".MyAnnotationWithParam3"; AnnotationDescriptor annotation3 = getAnnotationInClassByType("C", annotationTypeName3); @@ -163,7 +163,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe CompileTimeConstant actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value"); assert actualCompileTimeConstant instanceof ArrayValue; - checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", + checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", "java.lang.annotation.ElementType", values); } @@ -176,7 +176,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe CompileTimeConstant actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value"); assert actualCompileTimeConstant instanceof ArrayValue; - checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", "jet.String", values); + checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", "jet.String", values); } public void testAnnotationWithEmptyArrayInParam() throws IOException { @@ -189,7 +189,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe CompileTimeConstant actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value"); assert actualCompileTimeConstant instanceof ArrayValue; - checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", "jet.String", values); + checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array?", "jet.String", values); } private static void compareJetTypeWithClass(@NotNull JetType actualType, @NotNull String expectedType) { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java index 233ed327c02..3e1078dcf66 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java @@ -40,7 +40,6 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.test.util.NamespaceComparator; @@ -80,10 +79,10 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment { Pair javaNamespaceAndBindingContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary(files, tmpDir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); + NamespaceDescriptor javaNamespace = javaNamespaceAndBindingContext.first; //NOTE: comparing namespace to file (hack) - NamespaceComparator.compareNamespaces(javaNamespace, javaNamespace, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, expected); - ExpectedLoadErrorsUtil.checkForLoadErrors(javaNamespace, javaNamespaceAndBindingContext.second); + AbstractLoadJavaTest.checkLoadedNamespaces(expected, javaNamespace, javaNamespaceAndBindingContext); } public void testPackageLocalVisibility() throws Exception { diff --git a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after index 7ccbabbe802..a289c190484 100644 --- a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after +++ b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after @@ -2,7 +2,7 @@ import foo.Intf class Impl(): Intf { - public override fun fooBar(i: Int, s: Array?, foo: Any?) { + public override fun fooBar(i: Int, s: Array?, foo: Any?) { throw UnsupportedOperationException() } } diff --git a/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after index c399baf5e61..8fdb67028fa 100644 --- a/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after +++ b/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after @@ -2,7 +2,7 @@ import foo.A class C : A() { - public override fun getAnswer(array: Array?, number: Int, value: Any?): Int { + public override fun getAnswer(array: Array?, number: Int, value: Any?): Int { return super.getAnswer(array, number, value) } }