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

Check conflicting overloads for generic signatures.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-02-12 18:10:19 +03:00
parent ab962d9bae
commit 77b7128689
9 changed files with 131 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+6
View File
@@ -11697,6 +11697,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("ConflictingOlverloadsGenericFunctions.kt")
public void testConflictingOlverloadsGenericFunctions() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOlverloadsGenericFunctions.kt");
doTest(fileName);
}
@TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt")
public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.kt");
compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
+8 -14
View File
@@ -96,18 +96,15 @@ public class KotlinOverloadTest extends KotlinTestWithEnvironment {
"fun a(a : Int?) : Int",
"fun a(a : Int) : Int");
assertNotOverloadable(
assertOverloadable(
"fun <T> a(a : Int) : Int",
"fun a(a : Int) : Int");
// TODO
/*
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : T1> a(a : T1) : T1",
"fun <T, Y> a(a : T) : T");
*/
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : T1> a(a : T1) : T1",
"fun <T, Y : T> a(a : Y) : T");
@@ -115,30 +112,27 @@ public class KotlinOverloadTest extends KotlinTestWithEnvironment {
"fun <T1, X : T1> a(a : T1) : X",
"fun <T, Y : T> a(a : T) : T");
// TODO
/*
assertNotOverloadable(
"fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
"fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
*/
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : Array<T1>> a(a : Array<in T1>) : T1",
"fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
"fun <T, Y : Array<in T>> a(a : Array<in T>) : T");
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
"fun <T, Y : Array<*>> a(a : Array<in T>) : T");
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
"fun <T, Y : Array<out T>> a(a : Array<out T>) : T");
assertOverloadable(
assertNotOverloadable(
"fun <T1, X : Array<out T1>> a(a : Array<*>) : T1",
"fun <T, Y : Array<out T>> a(a : Array<in T>) : T");