azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests fixed after default nullability for type arguments changed to NotNull

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-07 21:42:48 +04:00
parent d4d713050a
commit 947ab99f53
8 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesInconsistentGenericTypes.txt
+1 -1
View File
@@ -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 <init>(): test.TwoSuperclassesInconsistentGenericTypes.Sub
public open override /*2*/ fun foo(): jet.MutableList<jet.String?>
public open override /*2*/ fun foo(): jet.MutableList<jet.String>
}
}
compiler/testData/loadJavaCustom/kotlinSignature/TwoSuperclassesVarargAndNot.java
+1
View File
@@ -14,6 +14,7 @@ public interface TwoSuperclassesVarargAndNot {
}
public interface Super2 {
@KotlinSignature("fun foo(s : Array<out String?>?)")
void foo(String[] s);
}
compiler/testData/loadJavaCustom/subclassWithRawType/SubclassWithRawType.txt
+9 -9
View File
@@ -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<jet.List<jet.String?>?>?
public abstract override /*1*/ fun array2(): jet.Array<jet.List<jet.Any?>?>?
public abstract override /*1*/ fun array1(): jet.Array<jet.List<jet.String?>>?
public abstract override /*1*/ fun array2(): jet.Array<jet.List<jet.Any>>?
public abstract override /*1*/ fun boundWildcard1(): jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun boundWildcard2(): jet.MutableList<in jet.List<jet.Any?>?>?
public abstract override /*1*/ fun boundWildcard2(): jet.MutableList<in jet.List<jet.Any>?>?
public abstract override /*1*/ fun simple1(): jet.MutableList<out jet.String?>?
public abstract override /*1*/ fun simple2(): jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun simple3(): jet.MutableList<out jet.Any?>?
public abstract override /*1*/ fun simple2(): jet.MutableList<out jet.List<jet.String>?>?
public abstract override /*1*/ fun simple3(): jet.MutableList<out jet.Any>?
public abstract override /*1*/ fun wildcard(): jet.MutableList<out jet.Any?>?
}
public abstract trait test.SubclassWithRawType.Super : java.lang.Object {
public abstract fun array1(): jet.Array<jet.List<jet.Any?>?>?
public abstract fun array2(): jet.Array<jet.List<jet.String?>?>?
public abstract fun array1(): jet.Array<jet.List<jet.Any?>>?
public abstract fun array2(): jet.Array<jet.List<jet.String>>?
public abstract fun boundWildcard1(): jet.MutableList<out jet.List<jet.Any?>?>?
public abstract fun boundWildcard2(): jet.MutableList<in jet.List<jet.String?>?>?
public abstract fun boundWildcard2(): jet.MutableList<in jet.List<jet.String>?>?
public abstract fun simple1(): jet.MutableList<out jet.Any?>?
public abstract fun simple2(): jet.MutableList<out jet.Any?>?
public abstract fun simple3(): jet.MutableList<jet.String?>?
public abstract fun simple3(): jet.MutableList<jet.String>?
public abstract fun wildcard(): jet.MutableList<out jet.Any?>?
}
}
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+8
View File
@@ -50,6 +50,14 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
Pair<NamespaceDescriptor, BindingContext> 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<NamespaceDescriptor, BindingContext> nsbAndBindingContext
) {
NamespaceDescriptor nsb = nsbAndBindingContext.first;
boolean fail = false;
compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java
+4 -4
View File
@@ -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<jet.String?>?", "[\"test\", \"test2\"]");
DEFAULT_PACKAGE + ".MyAnnotation2", "jet.Array<jet.String>?", "[\"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<java.lang.annotation.ElementType?>?",
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<java.lang.annotation.ElementType>?",
"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?>?", "jet.String", values);
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<jet.String>?", "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?>?", "jet.String", values);
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<jet.String>?", "jet.String", values);
}
private static void compareJetTypeWithClass(@NotNull JetType actualType, @NotNull String expectedType) {
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
+2 -3
View File
@@ -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<NamespaceDescriptor, BindingContext> 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 {
idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+1 -1
View File
@@ -2,7 +2,7 @@ import foo.Intf
class Impl(): Intf {
public override fun fooBar(i: Int, s: Array<out String?>?, foo: Any?) {
public override fun fooBar(i: Int, s: Array<out String>?, foo: Any?) {
throw UnsupportedOperationException()
}
}
idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
+1 -1
View File
@@ -2,7 +2,7 @@ import foo.A
class C : A() {
public override fun getAnswer(array: Array<out String?>?, number: Int, value: Any?): Int {
public override fun getAnswer(array: Array<out String>?, number: Int, value: Any?): Int {
return super<A>.getAnswer(array, number, value)
}
}