KT-11086 Treat initializer of a companion object as a class initializer

This commit is contained in:
Alexey Andreev
2016-05-17 12:49:05 +03:00
parent c5eaea846d
commit f0ee52faaf
6 changed files with 43 additions and 17 deletions
@@ -37,12 +37,6 @@ public class ClassesTestGenerated extends AbstractClassesTest {
doTest(fileName);
}
@TestMetadata("classObjectAsStaticInitializer.kt")
public void ignoredClassObjectAsStaticInitializer() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt");
doTest(fileName);
}
@TestMetadata("classObjectToString.kt")
public void ignoredClassObjectToString() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt");
@@ -131,6 +125,12 @@ public class ClassesTestGenerated extends AbstractClassesTest {
doTest(fileName);
}
@TestMetadata("classObjectAsStaticInitializer.kt")
public void testClassObjectAsStaticInitializer() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt");
doTest(fileName);
}
@TestMetadata("classObjectField.kt")
public void testClassObjectField() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectField.kt");