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

KT-3302 Method that implements two differing interfaces are reported as "Incompatible types in superclasses"

Browse Source 
#KT-3302 fixed
This commit is contained in:
Evgeny Gerashchenko
2013-01-31 18:57:40 +04:00
parent 0f401d4c9d
commit 74771cb2db
36 changed files with 695 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+55
View File
@@ -493,6 +493,16 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java");
}
@TestMetadata("DeeplySubstitutedClassParameter.java")
public void testDeeplySubstitutedClassParameter() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java");
}
@TestMetadata("DeeplySubstitutedClassParameter2.java")
public void testDeeplySubstitutedClassParameter2() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java");
}
@TestMetadata("InheritMutability.java")
public void testInheritMutability() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.java");
@@ -553,6 +563,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java");
}
@TestMetadata("Kt3302.java")
public void testKt3302() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/Kt3302.java");
}
@TestMetadata("MutableToReadOnly.java")
public void testMutableToReadOnly() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java");
@@ -578,6 +593,21 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java");
}
@TestMetadata("SubclassFromGenericAndNot.java")
public void testSubclassFromGenericAndNot() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java");
}
@TestMetadata("SubstitutedClassParameter.java")
public void testSubstitutedClassParameter() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java");
}
@TestMetadata("SubstitutedClassParameters.java")
public void testSubstitutedClassParameters() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java");
}
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return")
@@ -621,6 +651,16 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java");
}
@TestMetadata("DeeplySubstitutedClassParameter.java")
public void testDeeplySubstitutedClassParameter() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java");
}
@TestMetadata("DeeplySubstitutedClassParameter2.java")
public void testDeeplySubstitutedClassParameter2() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java");
}
@TestMetadata("HalfSubstitutedTypeParameters.java")
public void testHalfSubstitutedTypeParameters() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java");
@@ -671,6 +711,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.java");
}
@TestMetadata("SubclassFromGenericAndNot.java")
public void testSubclassFromGenericAndNot() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java");
}
@TestMetadata("SubclassOfCollection.java")
public void testSubclassOfCollection() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java");
@@ -681,6 +726,16 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java");
}
@TestMetadata("SubstitutedClassParameter.java")
public void testSubstitutedClassParameter() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java");
}
@TestMetadata("SubstitutedClassParameters.java")
public void testSubstitutedClassParameters() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java");
}
@TestMetadata("TwoSuperclassesConflictingProjectionKinds.java")
public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+55
View File
@@ -1428,6 +1428,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
}
@TestMetadata("DeeplySubstitutedClassParameter.kt")
public void testDeeplySubstitutedClassParameter() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
}
@TestMetadata("DeeplySubstitutedClassParameter2.kt")
public void testDeeplySubstitutedClassParameter2() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
}
@TestMetadata("InheritMutability.kt")
public void testInheritMutability() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
@@ -1488,6 +1498,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
}
@TestMetadata("Kt3302.kt")
public void testKt3302() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
}
@TestMetadata("MutableToReadOnly.kt")
public void testMutableToReadOnly() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
@@ -1513,6 +1528,21 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
}
@TestMetadata("SubclassFromGenericAndNot.kt")
public void testSubclassFromGenericAndNot() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
}
@TestMetadata("SubstitutedClassParameter.kt")
public void testSubstitutedClassParameter() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
}
@TestMetadata("SubstitutedClassParameters.kt")
public void testSubstitutedClassParameters() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
}
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return")
@@ -1556,6 +1586,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
}
@TestMetadata("DeeplySubstitutedClassParameter.kt")
public void testDeeplySubstitutedClassParameter() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
}
@TestMetadata("DeeplySubstitutedClassParameter2.kt")
public void testDeeplySubstitutedClassParameter2() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
}
@TestMetadata("HalfSubstitutedTypeParameters.kt")
public void testHalfSubstitutedTypeParameters() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
@@ -1606,6 +1646,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
}
@TestMetadata("SubclassFromGenericAndNot.kt")
public void testSubclassFromGenericAndNot() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
}
@TestMetadata("SubclassOfCollection.kt")
public void testSubclassOfCollection() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
@@ -1616,6 +1661,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
}
@TestMetadata("SubstitutedClassParameter.kt")
public void testSubstitutedClassParameter() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
}
@TestMetadata("SubstitutedClassParameters.kt")
public void testSubstitutedClassParameters() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
}
@TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt")
public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");