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

Update test data for j2k converter tests

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-28 18:00:45 +03:00
parent d689c11848
commit 1adf15d01d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// ERROR: Cannot access 'staticFoo': it is 'private' in '<class-object-for-C>' // ERROR: Cannot access 'staticFoo': it is 'private' in 'Default'
// ERROR: Cannot access 'staticFoo': it is 'private' in '<class-object-for-C>' // ERROR: Cannot access 'staticFoo': it is 'private' in 'Default'
fun C(arg1: Int, arg2: Int, other: C): C { fun C(arg1: Int, arg2: Int, other: C): C {
val __ = C(arg1, arg2, 0) val __ = C(arg1, arg2, 0)
System.out.println(__.foo(1) + __.foo(2) + other.foo(3) + C.staticFoo(4) + C.staticFoo(5)) System.out.println(__.foo(1) + __.foo(2) + other.foo(3) + C.staticFoo(4) + C.staticFoo(5))
j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// ERROR: Cannot access 'staticField1': it is 'private' in '<class-object-for-C>' // ERROR: Cannot access 'staticField1': it is 'private' in 'Default'
// ERROR: Cannot access 'staticField2': it is 'private' in '<class-object-for-C>' // ERROR: Cannot access 'staticField2': it is 'private' in 'Default'
fun C(p: Int): C { fun C(p: Int): C {
val __ = C() val __ = C()
System.out.println(C.staticField1 + C.staticField2) System.out.println(C.staticField1 + C.staticField2)
j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java
+2 -2
View File
@@ -4,7 +4,7 @@ import kotlinApi.KotlinClass;
class C { class C {
int foo() { int foo() {
KotlinClass.staticVar = KotlinClass.staticVar * 2; KotlinClass.staticVar = KotlinClass.staticVar * 2;
KotlinClass.OBJECT$.setStaticProperty(KotlinClass.OBJECT$.getStaticVar() + KotlinClass.OBJECT$.getStaticProperty()); KotlinClass.Default.setStaticProperty(KotlinClass.Default.getStaticVar() + KotlinClass.Default.getStaticProperty());
return KotlinClass.OBJECT$.staticFun(1); return KotlinClass.Default.staticFun(1);
} }
} }
j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java
+4 -4
View File
@@ -5,10 +5,10 @@ class A {
int foo(KotlinClass c) { int foo(KotlinClass c) {
return c.getNullableProperty().length() return c.getNullableProperty().length()
+ c.getProperty().length() + c.getProperty().length()
+ KotlinClass.OBJECT$.getNullableStaticVar() + KotlinClass.Default.getNullableStaticVar()
+ KotlinClass.OBJECT$.getStaticVar() + KotlinClass.Default.getStaticVar()
+ KotlinClass.OBJECT$.nullableStaticFun(1) + KotlinClass.Default.nullableStaticFun(1)
+ KotlinClass.OBJECT$.staticFun(1) + KotlinClass.Default.staticFun(1)
+ KotlinApiPackage.nullableGlobalFunction("").length() + KotlinApiPackage.nullableGlobalFunction("").length()
+ KotlinApiPackage.globalFunction("").length(); + KotlinApiPackage.globalFunction("").length();
} }