Change part class naming scheme

update tests depending on part class naming
This commit is contained in:
Dmitry Petrov
2015-07-24 15:09:16 +03:00
committed by Michael Bogdanov
parent 801d10229b
commit a47eaa2cb5
59 changed files with 166 additions and 120 deletions
+4 -10
View File
@@ -1,13 +1,7 @@
package test
class ClassAndPartClash {
class ClassAndPartClash
class ClassAndPartClash_
class ClassAndPartClashKt
}
class ClassAndPartClash_ {
}
fun z () {
}
fun z () {}
+3 -3
View File
@@ -1,7 +1,7 @@
compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClash_' generated from: package-fragment test, ClassAndPartClash_
compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt
package test
^
compiler/testData/cli/jvm/classAndPartClash.kt:7:1: error: duplicate JVM class name 'test/ClassAndPartClash_' generated from: package-fragment test, ClassAndPartClash_
class ClassAndPartClash_ {
compiler/testData/cli/jvm/classAndPartClash.kt:5:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt
class ClassAndPartClashKt
^
COMPILATION_ERROR
+3
View File
@@ -0,0 +1,3 @@
$TESTDATA_DIR$/sanitized-name.clash.kt
-d
$TEMP_DIR$
+5
View File
@@ -0,0 +1,5 @@
class SanitizedNameClash
class Sanitized_Name_Clash
class Sanitized_name_clashKt
fun foo() {}
+7
View File
@@ -0,0 +1,7 @@
compiler/testData/cli/jvm/sanitized-name.clash.kt:1:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment , Sanitized_name_clashKt
class SanitizedNameClash
^
compiler/testData/cli/jvm/sanitized-name.clash.kt:3:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment , Sanitized_name_clashKt
class Sanitized_name_clashKt
^
COMPILATION_ERROR