Update tests depending on part class naming

This commit is contained in:
Dmitry Petrov
2015-07-27 14:57:39 +03:00
committed by Michael Bogdanov
parent a47eaa2cb5
commit cd6ff31129
16 changed files with 20 additions and 56 deletions
@@ -30,11 +30,11 @@ fun box(): String {
class Local
val l = Local::class.jvmName
assertTrue(l != null && l.startsWith("_DefaultPackage\$") && "\$box\$" in l && l.endsWith("\$Local"))
assertTrue(l != null && l.startsWith("JvmNameKt\$") && "\$box\$" in l && l.endsWith("\$Local"))
val obj = object {}
val o = obj.javaClass.kotlin.jvmName
assertTrue(o != null && o.startsWith("_DefaultPackage\$") && "\$box\$" in o && o.endsWith("\$1"))
assertTrue(o != null && o.startsWith("JvmNameKt\$") && "\$box\$" in o && o.endsWith("\$1"))
return "OK"
}
@@ -8,7 +8,8 @@ fun box(): String {
assert(p.javaField != null, "Fail p field")
val field = p.javaField!!
assert(field.getDeclaringClass().getName() contains "_DefaultPackage\$", "Fail field not in package part: ${field.getDeclaringClass()}")
val className = field.getDeclaringClass().getName()
assertEquals("TopLevelPropertyKt", className)
val getter = p.javaGetter!!
val setter = p.javaSetter!!
@@ -4,5 +4,5 @@ fun test2() {
1.test1()
}
// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(I\)V
// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
// 2 INVOKESTATIC _1Kt.test1 \(I\)V
// 1 INVOKESTATIC _1Kt.test2 \(\)V
@@ -1,8 +0,0 @@
fun Int.test1() {}
fun test2() {
1.test1()
}
// 2 INVOKESTATIC A1Kt.test1 \(I\)V
// 1 INVOKESTATIC A1Kt.test2 \(\)V
@@ -2,5 +2,5 @@ package a
fun test1() {}
// 2 INVOKESTATIC a/APackage.+\.test1 \(\)V
// 1 INVOKESTATIC b/BPackage.+\.test2 \(\)V
// 2 INVOKESTATIC a/_1Kt.test1 \(\)V
// 1 INVOKESTATIC b/_2Kt.test2 \(\)V
@@ -1,6 +0,0 @@
package a
fun test1() {}
// 2 INVOKESTATIC a/A1Kt.test1 \(\)V
// 1 INVOKESTATIC b/A2Kt.test2 \(\)V
@@ -1,4 +1,4 @@
fun test1() {}
// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V
// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
// 2 INVOKESTATIC _1Kt.test1 \(\)V
// 1 INVOKESTATIC _2Kt.test2 \(\)V
@@ -4,5 +4,5 @@ fun test2() {
test1()
}
// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V
// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
// 2 INVOKESTATIC _1Kt.test1 \(\)V
// 1 INVOKESTATIC _1Kt.test2 \(\)V
@@ -1,8 +0,0 @@
fun test1() {}
fun test2() {
test1()
}
// 2 INVOKESTATIC A1Kt.test1 \(\)V
// 1 INVOKESTATIC A1Kt.test2 \(\)V
@@ -2,5 +2,5 @@ package a
val prop = 1
// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I
// 1 GETSTATIC a/APackage.+\.prop \: I
// 2 INVOKESTATIC a/_1Kt.getProp \(\)I
// 1 GETSTATIC a/_1Kt.prop \: I
@@ -1,6 +0,0 @@
package a
val prop = 1
// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
// 1 GETSTATIC a/A1Kt.prop \: I
@@ -5,5 +5,5 @@ val prop: Int = 0
return $prop + 1
}
// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I
// 1 GETSTATIC a/APackage.+\.prop \: I
// 2 INVOKESTATIC a/_1Kt.getProp \(\)I
// 1 GETSTATIC a/_1Kt.prop \: I
@@ -1,9 +0,0 @@
package a
val prop: Int = 0
get() {
return $prop + 1
}
// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
// 1 GETSTATIC a/A1Kt.prop \: I
@@ -8,5 +8,5 @@ fun test2() {
prop
}
// 1 a/APackage\.test1 \(\)V
// 1 a/APackage\.getProp \(\)I
// 1 a/APackage.test1 \(\)V
// 1 a/APackage.getProp \(\)I
@@ -1,6 +1,6 @@
Deprecated("") val test: Int = 0
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: _DefaultPackage$, test
// TESTED_OBJECTS: TopLevelPropertyKt, test
// IS_FULL_CONTAINING_CLASS_NAME: false
// FLAGS: ACC_DEPRECATED, ACC_FINAL, ACC_STATIC
@@ -4557,7 +4557,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
@RunWith(JUnit3RunnerWithInners.class)
public static class OptimizeImports extends AbstractQuickFixTest {
public void testAllFilesPresentInOptimizeImports() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([a-zA-Z0-9]+)\\.kt$"), true);
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("fileRuntime.kt")