Minor, deduplicate matching JVM_OLD/JVM_IR duplicateJvmSignature tests

2020-09-21 18:46:21 +02:00
parent 05c662ec55
commit 6f622920e7
14 changed files with 21 additions and 131 deletions
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_IR

 interface Foo<T> {
    fun foo(l: List<T>)
@@ -12,4 +11,4 @@ interface Bar<T> {
 class <!CONFLICTING_JVM_DECLARATIONS!>Baz(f: Foo<String>, b: Bar<Int>)<!> :
    Foo<String> by f,
    Bar<Int> by b {
-}
+}
@@ -1,15 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo<T> {
-    fun foo(l: List<T>)
-}
-
-interface Bar<T> {
-    fun foo(l: List<T>)
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Baz(f: Foo<String>, b: Bar<Int>)<!> :
-    Foo<String> by f,
-    Bar<Int> by b {
-}
@@ -1,24 +0,0 @@
-package
-
-public interface Bar</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
-    public constructor Baz(/*0*/ f: Foo<kotlin.String>, /*1*/ b: Bar<kotlin.Int>)
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_IR

 interface Foo<T> {
    fun foo(l: List<T>)
@@ -7,4 +6,4 @@ interface Foo<T> {

 class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {
    <!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
-}
+}
@@ -1,10 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo<T> {
-    fun foo(l: List<T>)
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
-}
@@ -1,17 +0,0 @@
-package
-
-public final class Bar : Foo<kotlin.String> {
-    public constructor Bar(/*0*/ f: Foo<kotlin.String>)
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_IR

 interface Foo<T> {
    fun foo(l: List<T>) {
@@ -13,4 +12,4 @@ class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {

 class BarOther(f: Foo<String>): Foo<String> by f {
    override fun foo(l: List<String>) {}
-}
+}
@@ -1,16 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo<T> {
-    fun foo(l: List<T>) {
-
-    }
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
-}
-
-class BarOther(f: Foo<String>): Foo<String> by f {
-    override fun foo(l: List<String>) {}
-}
@@ -1,25 +0,0 @@
-package
-
-public final class Bar : Foo<kotlin.String> {
-    public constructor Bar(/*0*/ f: Foo<kotlin.String>)
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class BarOther : Foo<kotlin.String> {
-    public constructor BarOther(/*0*/ f: Foo<kotlin.String>)
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
@@ -204,19 +204,19 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt");
            }

-            @TestMetadata("delegateToTwoTraits_ir.kt")
-            public void testDelegateToTwoTraits_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits_ir.kt");
+            @TestMetadata("delegateToTwoTraits.kt")
+            public void testDelegateToTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt");
            }

-            @TestMetadata("delegationAndOwnMethod_ir.kt")
-            public void testDelegationAndOwnMethod_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod_ir.kt");
+            @TestMetadata("delegationAndOwnMethod.kt")
+            public void testDelegationAndOwnMethod() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt");
            }

-            @TestMetadata("delegationToTraitImplAndOwnMethod_ir.kt")
-            public void testDelegationToTraitImplAndOwnMethod_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod_ir.kt");
+            @TestMetadata("delegationToTraitImplAndOwnMethod.kt")
+            public void testDelegationToTraitImplAndOwnMethod() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt");
            }

            @TestMetadata("extensionProperties.kt")
@@ -194,19 +194,19 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt");
            }

-            @TestMetadata("delegateToTwoTraits_old.kt")
-            public void testDelegateToTwoTraits_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits_old.kt");
+            @TestMetadata("delegateToTwoTraits.kt")
+            public void testDelegateToTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt");
            }

-            @TestMetadata("delegationAndOwnMethod_old.kt")
-            public void testDelegationAndOwnMethod_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod_old.kt");
+            @TestMetadata("delegationAndOwnMethod.kt")
+            public void testDelegationAndOwnMethod() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt");
            }

-            @TestMetadata("delegationToTraitImplAndOwnMethod_old.kt")
-            public void testDelegationToTraitImplAndOwnMethod_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod_old.kt");
+            @TestMetadata("delegationToTraitImplAndOwnMethod.kt")
+            public void testDelegationToTraitImplAndOwnMethod() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt");
            }

            @TestMetadata("extensionProperties.kt")