update tests: jvmName --> JvmName

This commit is contained in:
Dmitry Petrov
2015-09-07 12:19:29 +03:00
parent 2519641b2b
commit bc5e29df9f
15 changed files with 16 additions and 16 deletions
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.resolve.constants.StringValue
public object JvmFileClassUtil { public object JvmFileClassUtil {
public val JVM_NAME: FqName = FqName("kotlin.jvm.jvmName") public val JVM_NAME: FqName = FqName("kotlin.jvm.JvmName")
public val JVM_NAME_SHORT: String = JVM_NAME.shortName().asString() public val JVM_NAME_SHORT: String = JVM_NAME.shortName().asString()
// TODO @JvmMultifileClass // TODO @JvmMultifileClass
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("Foo") @file:JvmName("Foo")
package test package test
public fun foo() {} public fun foo() {}
+1 -1
View File
@@ -1,5 +1,5 @@
compiler/testData/cli/jvm/classAndFileClassClash.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo compiler/testData/cli/jvm/classAndFileClassClash.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo
@file:jvmName("Foo") @file:JvmName("Foo")
^ ^
compiler/testData/cli/jvm/classAndFileClassClash.kt:6:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo compiler/testData/cli/jvm/classAndFileClassClash.kt:6:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo
class Foo {} class Foo {}
+1 -1
View File
@@ -1,5 +1,5 @@
compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test
@file:jvmName("Foo") @file:JvmName("Foo")
^ ^
compiler/testData/cli/jvm/classAndOtherFileClassClash2.kt:3:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test compiler/testData/cli/jvm/classAndOtherFileClassClash2.kt:3:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test
class Foo class Foo
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("Foo") @file:JvmName("Foo")
package test package test
public fun foo() {} public fun foo() {}
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("TestPackage") @file:JvmName("TestPackage")
package test package test
fun foo() {} fun foo() {}
+1 -1
View File
@@ -1,4 +1,4 @@
compiler/testData/cli/jvm/fileClassAndFacadeClash.kt:1:1: error: duplicate JVM class name 'test/TestPackage' generated from: package-fragment test, package-fragment test compiler/testData/cli/jvm/fileClassAndFacadeClash.kt:1:1: error: duplicate JVM class name 'test/TestPackage' generated from: package-fragment test, package-fragment test
@file:jvmName("TestPackage") @file:JvmName("TestPackage")
^ ^
COMPILATION_ERROR COMPILATION_ERROR
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("XXX\$\$TImpl") @file:JvmName("XXX\$\$TImpl")
package test package test
interface XXX interface XXX
+2 -2
View File
@@ -1,7 +1,7 @@
compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test
@file:jvmName("Util") @file:JvmName("Util")
^ ^
compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test
@file:jvmName("Util") @file:JvmName("Util")
^ ^
COMPILATION_ERROR COMPILATION_ERROR
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("Util") @file:JvmName("Util")
package test package test
public fun foo() {} public fun foo() {}
+1 -1
View File
@@ -1,4 +1,4 @@
@file:jvmName("Util") @file:JvmName("Util")
package test package test
public fun bar() {} public fun bar() {}
@@ -1,2 +1,2 @@
@file:jvmName("Bar") @file:JvmName("Bar")
public fun bar(): String = "K" public fun bar(): String = "K"
@@ -1,2 +1,2 @@
@file:jvmName("Foo") @file:JvmName("Foo")
public fun foo(): String = "O" public fun foo(): String = "O"
@@ -1,2 +1,2 @@
@file:jvmName("Foo") @file:JvmName("Foo")
public fun foo(): String = "OK" public fun foo(): String = "OK"
@@ -1,4 +1,4 @@
@file:jvmName("Util") @file:JvmName("Util")
package test package test
fun foo(): String = bar() fun foo(): String = bar()