From 1adf15d01d877c3eeca6e8af999dca44a08974f0 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 28 Jan 2015 18:00:45 +0300 Subject: [PATCH] Update test data for j2k converter tests --- .../fileOrElement/constructors/methodCallInFactoryFun.kt | 4 ++-- .../constructors/staticFieldRefInFactoryFun.kt | 4 ++-- .../fileOrElement/kotlinApiAccess/ClassObjectMembers.java | 4 ++-- .../kotlinApiAccess/CorrectNullabilityDetected.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt index 9b0912098a1..3cf1947800b 100644 --- a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt @@ -1,5 +1,5 @@ -// ERROR: Cannot access 'staticFoo': it is 'private' in '' -// ERROR: Cannot access 'staticFoo': it is 'private' in '' +// ERROR: Cannot access 'staticFoo': it is 'private' in 'Default' +// ERROR: Cannot access 'staticFoo': it is 'private' in 'Default' fun C(arg1: Int, arg2: Int, other: C): C { val __ = C(arg1, arg2, 0) System.out.println(__.foo(1) + __.foo(2) + other.foo(3) + C.staticFoo(4) + C.staticFoo(5)) diff --git a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt index da85fa6687d..17cd586f89a 100644 --- a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt @@ -1,5 +1,5 @@ -// ERROR: Cannot access 'staticField1': it is 'private' in '' -// ERROR: Cannot access 'staticField2': it is 'private' in '' +// ERROR: Cannot access 'staticField1': it is 'private' in 'Default' +// ERROR: Cannot access 'staticField2': it is 'private' in 'Default' fun C(p: Int): C { val __ = C() System.out.println(C.staticField1 + C.staticField2) diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java index f01d208bda8..def338399c8 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java @@ -4,7 +4,7 @@ import kotlinApi.KotlinClass; class C { int foo() { KotlinClass.staticVar = KotlinClass.staticVar * 2; - KotlinClass.OBJECT$.setStaticProperty(KotlinClass.OBJECT$.getStaticVar() + KotlinClass.OBJECT$.getStaticProperty()); - return KotlinClass.OBJECT$.staticFun(1); + KotlinClass.Default.setStaticProperty(KotlinClass.Default.getStaticVar() + KotlinClass.Default.getStaticProperty()); + return KotlinClass.Default.staticFun(1); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java index c34afad318a..527c0eace67 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java @@ -5,10 +5,10 @@ class A { int foo(KotlinClass c) { return c.getNullableProperty().length() + c.getProperty().length() - + KotlinClass.OBJECT$.getNullableStaticVar() - + KotlinClass.OBJECT$.getStaticVar() - + KotlinClass.OBJECT$.nullableStaticFun(1) - + KotlinClass.OBJECT$.staticFun(1) + + KotlinClass.Default.getNullableStaticVar() + + KotlinClass.Default.getStaticVar() + + KotlinClass.Default.nullableStaticFun(1) + + KotlinClass.Default.staticFun(1) + KotlinApiPackage.nullableGlobalFunction("").length() + KotlinApiPackage.globalFunction("").length(); }