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

Loading java arrays as Array<out T> at method return type position, as well.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-15 19:19:58 +04:00
parent d2a308964d
commit 21e97b408c
21 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java
+4 -4
View File
@@ -123,7 +123,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
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<out jet.String?>?", "[\"test\", \"test2\"]");
String annotationTypeName3 = DEFAULT_PACKAGE + ".MyAnnotationWithParam3";
AnnotationDescriptor annotation3 = getAnnotationInClassByType("C", annotationTypeName3);
@@ -183,7 +183,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
CompileTimeConstant<?> actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value");
assert actualCompileTimeConstant instanceof ArrayValue;
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<java.lang.annotation.ElementType?>?",
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<out java.lang.annotation.ElementType?>?",
"java.lang.annotation.ElementType", values);
}
@@ -197,7 +197,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
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<out jet.String?>?", "jet.String", values);
}
public void testAnnotationWithEmptyArrayInParam() throws IOException {
@@ -211,7 +211,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
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<out jet.String?>?", "jet.String", values);
}
private void compileJavaFile(@NotNull String fileRelativePath, @Nullable String classPath)