[Tests] Convert diagnostics test for #KT-65555 to box test
This commit is contained in:
committed by
Space Team
parent
fd66e5d5b8
commit
365973f03a
-6
@@ -29209,12 +29209,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
|
|||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@TestMetadata("kt65555.kt")
|
|
||||||
public void testKt65555() {
|
|
||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("kt9550.kt")
|
@TestMetadata("kt9550.kt")
|
||||||
public void testKt9550() {
|
public void testKt9550() {
|
||||||
|
|||||||
+6
@@ -8206,6 +8206,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
-6
@@ -29209,12 +29209,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
|
|||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@TestMetadata("kt65555.kt")
|
|
||||||
public void testKt65555() {
|
|
||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("kt9550.kt")
|
@TestMetadata("kt9550.kt")
|
||||||
public void testKt9550() {
|
public void testKt9550() {
|
||||||
|
|||||||
+6
@@ -8206,6 +8206,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
-6
@@ -26955,12 +26955,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
|
|||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@TestMetadata("kt65555.kt")
|
|
||||||
public void testKt65555() {
|
|
||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("kt9550.kt")
|
@TestMetadata("kt9550.kt")
|
||||||
public void testKt9550() {
|
public void testKt9550() {
|
||||||
|
|||||||
-6
@@ -26961,12 +26961,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
|
|||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@TestMetadata("kt65555.kt")
|
|
||||||
public void testKt65555() {
|
|
||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("kt9550.kt")
|
@TestMetadata("kt9550.kt")
|
||||||
public void testKt9550() {
|
public void testKt9550() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
MODULE main
|
||||||
|
CLASS A.class
|
||||||
|
CLASS METADATA
|
||||||
|
K1
|
||||||
|
getSize()I
|
||||||
|
K2
|
||||||
|
---
|
||||||
|
K1
|
||||||
|
---
|
||||||
|
K2
|
||||||
|
size
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
// TARGET_BACKEND: JVM
|
||||||
|
// FULL_JDK
|
||||||
|
// ISSUE: KT-65555
|
||||||
|
// JVM_ABI_K1_K2_DIFF: KT-63828
|
||||||
|
|
||||||
|
interface MyCollection<E> : Collection<E>
|
||||||
|
interface MyList<E> : MyCollection<E>, List<E>
|
||||||
|
interface MyMutableList<E> : MyList<E>, MutableList<E>
|
||||||
|
|
||||||
|
class A(val delegate: ArrayList<String>) : MyMutableList<String>, MutableList<String> by delegate
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
val delegate = ArrayList<String>()
|
||||||
|
delegate.add("OK")
|
||||||
|
return A(delegate).get(0)
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
// FIR_IDENTICAL
|
|
||||||
// FULL_JDK
|
|
||||||
// WITH_STDLIB
|
|
||||||
// ISSUE: KT-65555
|
|
||||||
|
|
||||||
interface MyCollection<E> : Collection<E>
|
|
||||||
interface MyList<E> : MyCollection<E>, List<E>
|
|
||||||
interface MyMutableList<E> : MyList<E>, MutableList<E>
|
|
||||||
Generated
-6
@@ -29209,12 +29209,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
|||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@TestMetadata("kt65555.kt")
|
|
||||||
public void testKt65555() {
|
|
||||||
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("kt9550.kt")
|
@TestMetadata("kt9550.kt")
|
||||||
public void testKt9550() {
|
public void testKt9550() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+6
@@ -7901,6 +7901,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+6
@@ -8147,6 +8147,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
|
|||||||
+5
@@ -7097,6 +7097,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
|
|||||||
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
runTest("compiler/testData/codegen/box/collections/kt48945c.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt65555.kt")
|
||||||
|
public void testKt65555() {
|
||||||
|
runTest("compiler/testData/codegen/box/collections/kt65555.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("mutableList.kt")
|
@TestMetadata("mutableList.kt")
|
||||||
public void testMutableList() {
|
public void testMutableList() {
|
||||||
runTest("compiler/testData/codegen/box/collections/mutableList.kt");
|
runTest("compiler/testData/codegen/box/collections/mutableList.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user