azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-3500: ClassFormatError: Duplicate method name&signature in class file && KT-3429: Traits override bug

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-04-16 18:32:24 +04:00
parent 3da3f94b4e
commit 57b161b08a
15 changed files with 166 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -4352,6 +4352,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.kt");
}
@TestMetadata("notAccessibleSuperInTrait.kt")
public void testNotAccessibleSuperInTrait() throws Exception {
doTest("compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.kt");
}
@TestMetadata("QualifiedThis.kt")
public void testQualifiedThis() throws Exception {
doTest("compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.kt");
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+30
View File
@@ -3295,11 +3295,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt");
}
@TestMetadata("innerClassLabeledSuper2.kt")
public void testInnerClassLabeledSuper2() throws Exception {
doTest("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt");
}
@TestMetadata("innerClassLabeledSuperProperty.kt")
public void testInnerClassLabeledSuperProperty() throws Exception {
doTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt");
}
@TestMetadata("innerClassLabeledSuperProperty2.kt")
public void testInnerClassLabeledSuperProperty2() throws Exception {
doTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt");
}
@TestMetadata("kt3492ClassFun.kt")
public void testKt3492ClassFun() throws Exception {
doTest("compiler/testData/codegen/box/super/kt3492ClassFun.kt");
}
@TestMetadata("kt3492ClassProperty.kt")
public void testKt3492ClassProperty() throws Exception {
doTest("compiler/testData/codegen/box/super/kt3492ClassProperty.kt");
@@ -3338,6 +3353,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest("compiler/testData/codegen/box/traits/finalMethod.kt");
}
@TestMetadata("genericMethod.kt")
public void testGenericMethod() throws Exception {
doTest("compiler/testData/codegen/box/traits/genericMethod.kt");
}
@TestMetadata("inheritedFun.kt")
public void testInheritedFun() throws Exception {
doTest("compiler/testData/codegen/box/traits/inheritedFun.kt");
@@ -3383,6 +3403,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest("compiler/testData/codegen/box/traits/kt3413.kt");
}
@TestMetadata("kt3429.kt")
public void testKt3429() throws Exception {
doTest("compiler/testData/codegen/box/traits/kt3429.kt");
}
@TestMetadata("kt3500.kt")
public void testKt3500() throws Exception {
doTest("compiler/testData/codegen/box/traits/kt3500.kt");
}
@TestMetadata("multiple.kt")
public void testMultiple() throws Exception {
doTest("compiler/testData/codegen/box/traits/multiple.kt");