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

Fix primitive override problem in Kotlin-Java inheritance

Browse Source 
See the comment in JetTypeMapper
This commit is contained in:
Alexander Udalov
2013-12-25 19:39:57 +04:00
parent 2ea62bde23
commit 713c6f13ae
26 changed files with 358 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
+5
View File
@@ -92,6 +92,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
doTest("compiler/testData/codegen/bytecodeText/noVolatileAnnotation.kt");
}
@TestMetadata("noWrapperForMethodReturningPrimitive.kt")
public void testNoWrapperForMethodReturningPrimitive() throws Exception {
doTest("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt");
}
@TestMetadata("privateDefaultArgs.kt")
public void testPrivateDefaultArgs() throws Exception {
doTest("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt");
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
+71 -1
View File
@@ -91,6 +91,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
}
@TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
@InnerTestClasses({Method.PrimitiveOverride.class})
public static class Method extends AbstractCompileJavaAgainstKotlinTest {
public void testAllFilesPresentInMethod() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -186,6 +187,75 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
doTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
}
@TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
public static class PrimitiveOverride extends AbstractCompileJavaAgainstKotlinTest {
public void testAllFilesPresentInPrimitiveOverride() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("ByteOverridesObject.kt")
public void testByteOverridesObject() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
}
@TestMetadata("CallFinalNotInSubclass.kt")
public void testCallFinalNotInSubclass() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
}
@TestMetadata("CallNotInSubclass.kt")
public void testCallNotInSubclass() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
}
@TestMetadata("CovariantReturnTypeOverride.kt")
public void testCovariantReturnTypeOverride() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
}
@TestMetadata("FinalOverride.kt")
public void testFinalOverride() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
}
@TestMetadata("IntOverridesComparable.kt")
public void testIntOverridesComparable() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
}
@TestMetadata("IntOverridesNumber.kt")
public void testIntOverridesNumber() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
}
@TestMetadata("IntOverridesObject.kt")
public void testIntOverridesObject() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
}
@TestMetadata("ManyClassesHierarchy.kt")
public void testManyClassesHierarchy() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
}
@TestMetadata("NullableIntOverridesObject.kt")
public void testNullableIntOverridesObject() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
}
@TestMetadata("OverrideInJava.kt")
public void testOverrideInJava() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("Method");
suite.addTestSuite(Method.class);
suite.addTestSuite(PrimitiveOverride.class);
return suite;
}
}
@TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
@@ -238,7 +308,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
TestSuite suite = new TestSuite("CompileJavaAgainstKotlinTestGenerated");
suite.addTestSuite(CompileJavaAgainstKotlinTestGenerated.class);
suite.addTestSuite(Class.class);
suite.addTestSuite(Method.class);
suite.addTest(Method.innerSuite());
suite.addTestSuite(Property.class);
suite.addTestSuite(StaticFields.class);
return suite;