From 300aeb83b0bd41126894db8a110c4b430e7ff390 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 16 Oct 2015 20:40:00 +0300 Subject: [PATCH] Fix test data for j2k conversion (cherry picked from commit e3bac5e) --- .../kotlinApiAccess/CorrectNullabilityDetected.java | 4 ++-- .../fileOrElement/kotlinApiAccess/ExtensionFunction.java | 4 ++-- .../fileOrElement/kotlinApiAccess/ExtensionProperty.java | 6 +++--- .../fileOrElement/kotlinApiAccess/GlobalFunction.java | 4 ++-- .../kotlinApiAccess/GlobalGenericFunction.java | 4 ++-- .../fileOrElement/kotlinApiAccess/GlobalValue1.java | 6 +++--- .../fileOrElement/kotlinApiAccess/GlobalValue2.java | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java index 671e0b46e2e..4a0b0204c65 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java @@ -9,7 +9,7 @@ class A { + KotlinClass.Companion.getStaticVar() + KotlinClass.Companion.nullableStaticFun(1) + KotlinClass.Companion.staticFun(1) - + KotlinApiPackage.nullableGlobalFunction("").length() - + KotlinApiPackage.globalFunction("").length(); + + KotlinApiKt.nullableGlobalFunction("").length() + + KotlinApiKt.globalFunction("").length(); } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java index 7dcded5dde4..40b73e37d3b 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java @@ -1,8 +1,8 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { void foo() { - String s = KotlinApiPackage.extensionFunction(1); + String s = KotlinApiKt.extensionFunction(1); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java index 287bf3b0445..bee6e616b50 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java @@ -1,9 +1,9 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { int foo() { - KotlinApiPackage.setExtensionProperty("a", 1); - return KotlinApiPackage.getExtensionProperty("b"); + KotlinApiKt.setExtensionProperty("a", 1); + return KotlinApiKt.getExtensionProperty("b"); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java index 127088a30a3..a4838e7f534 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java @@ -1,8 +1,8 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { void foo() { - String s = KotlinApiPackage.globalFunction("x"); + String s = KotlinApiKt.globalFunction("x"); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java index be75de65a3a..9ad7637d310 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java @@ -1,8 +1,8 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { void foo() { - int v = KotlinApiPackage.globalGenericFunction(1); + int v = KotlinApiKt.globalGenericFunction(1); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java index 6ea68555ad6..640a93be27a 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java @@ -1,9 +1,9 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { int foo() { - KotlinApiPackage.setGlobalValue1(0); - return KotlinApiPackage.getGlobalValue1(); + KotlinApiKt.setGlobalValue1(0); + return KotlinApiKt.getGlobalValue1(); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java index 743a8fc3cfc..b065519b67f 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java @@ -1,9 +1,9 @@ //file -import kotlinApi.KotlinApiPackage; +import kotlinApi.KotlinApiKt; class C { int foo() { - KotlinApiPackage.setGlobalValue2(0); - return KotlinApiPackage.getGlobalValue2(); + KotlinApiKt.setGlobalValue2(0); + return KotlinApiKt.getGlobalValue2(); } }