Tests: remove diagnostic tests which are present elsewhere

- `typeParameterWithTwoBounds.kt` is already present in
  `diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/`.
- `clashWithCompanionObjectField.kt` is already present in
  `codegen/box/fieldRename/jvmFieldNoClash1.kt`.
- `jvmFieldAndJavaGetter.kt` is already present in
  `codegen/box/jvmField/noClashWithInheritedJavaMethod.kt`.

In case of two latter tests on JvmField, there's (correctly) no error
reported in JVM IR, which is why those are box tests.

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java

@@ -30820,12 +30820,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.kt");
       }
 
-      @Test
-      @TestMetadata("typeParameterWithTwoBounds.kt")
-      public void testTypeParameterWithTwoBounds() {
-        runTest("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt");
-      }
-
       @Nested
       @TestMetadata("compiler/testData/diagnostics/tests/redeclarations/shadowedExtension")
       @TestDataPath("$PROJECT_ROOT")
@@ -41897,12 +41891,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
       runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
     }
 
-    @Test
-    @TestMetadata("jvmFieldAndJavaGetter.kt")
-    public void testJvmFieldAndJavaGetter() {
-      runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
-    }
-
     @Test
     @TestMetadata("kt54410.kt")
     public void testKt54410() {
@@ -42485,12 +42473,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
           KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
         }
 
-        @Test
-        @TestMetadata("clashWithCompanionObjectField.kt")
-        public void testClashWithCompanionObjectField() {
-          runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt");
-        }
-
         @Test
         @TestMetadata("inMultiFileFacade.kt")
         public void testInMultiFileFacade() {

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java

@@ -30820,12 +30820,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.kt");
       }
 
-      @Test
-      @TestMetadata("typeParameterWithTwoBounds.kt")
-      public void testTypeParameterWithTwoBounds() {
-        runTest("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt");
-      }
-
       @Nested
       @TestMetadata("compiler/testData/diagnostics/tests/redeclarations/shadowedExtension")
       @TestDataPath("$PROJECT_ROOT")
@@ -41897,12 +41891,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
       runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
     }
 
-    @Test
-    @TestMetadata("jvmFieldAndJavaGetter.kt")
-    public void testJvmFieldAndJavaGetter() {
-      runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
-    }
-
     @Test
     @TestMetadata("kt54410.kt")
     public void testKt54410() {
@@ -42485,12 +42473,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
           KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
         }
 
-        @Test
-        @TestMetadata("clashWithCompanionObjectField.kt")
-        public void testClashWithCompanionObjectField() {
-          runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt");
-        }
-
         @Test
         @TestMetadata("inMultiFileFacade.kt")
         public void testInMultiFileFacade() {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java

@@ -28512,12 +28512,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.kt");
       }
 
-      @Test
-      @TestMetadata("typeParameterWithTwoBounds.kt")
-      public void testTypeParameterWithTwoBounds() {
-        runTest("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt");
-      }
-
       @Nested
       @TestMetadata("compiler/testData/diagnostics/tests/redeclarations/shadowedExtension")
       @TestDataPath("$PROJECT_ROOT")
@@ -39463,12 +39457,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
       runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
     }
 
-    @Test
-    @TestMetadata("jvmFieldAndJavaGetter.kt")
-    public void testJvmFieldAndJavaGetter() {
-      runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
-    }
-
     @Test
     @TestMetadata("kt54410.kt")
     public void testKt54410() {
@@ -40051,12 +40039,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
           KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
         }
 
-        @Test
-        @TestMetadata("clashWithCompanionObjectField.kt")
-        public void testClashWithCompanionObjectField() {
-          runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt");
-        }
-
         @Test
         @TestMetadata("inMultiFileFacade.kt")
         public void testInMultiFileFacade() {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java

@@ -28524,12 +28524,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.kt");
       }
 
-      @Test
-      @TestMetadata("typeParameterWithTwoBounds.kt")
-      public void testTypeParameterWithTwoBounds() {
-        runTest("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt");
-      }
-
       @Nested
       @TestMetadata("compiler/testData/diagnostics/tests/redeclarations/shadowedExtension")
       @TestDataPath("$PROJECT_ROOT")
@@ -39601,12 +39595,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
       runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
     }
 
-    @Test
-    @TestMetadata("jvmFieldAndJavaGetter.kt")
-    public void testJvmFieldAndJavaGetter() {
-      runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
-    }
-
     @Test
     @TestMetadata("kt54410.kt")
     public void testKt54410() {
@@ -40189,12 +40177,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
           KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
         }
 
-        @Test
-        @TestMetadata("clashWithCompanionObjectField.kt")
-        public void testClashWithCompanionObjectField() {
-          runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt");
-        }
-
         @Test
         @TestMetadata("inMultiFileFacade.kt")
         public void testInMultiFileFacade() {

compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.fir.kt

@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-interface Foo
-interface Bar
-
-fun <T> foo(x: T): T where T: Foo, T: Bar {null!!}
-fun foo(x: Foo): Foo {null!!}
-fun foo(x: Bar): Bar {null!!}

compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt

@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-interface Foo
-interface Bar
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T<!> where T: Foo, T: Bar {null!!}
-<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
-fun foo(x: Bar): Bar {null!!}

compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.txt

@@ -1,17 +0,0 @@
-package
-
-public fun foo(/*0*/ x: Bar): Bar
-public fun foo(/*0*/ x: Foo): Foo
-public fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
-
-public interface Bar {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.fir.kt

@@ -1,8 +0,0 @@
-class A {
-
-    @JvmField val clash = 1;
-
-    companion object {
-        val clash = 1;
-    }
-}

compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt

@@ -1,8 +0,0 @@
-class A {
-
-    <!CONFLICTING_JVM_DECLARATIONS!>@JvmField val clash<!> = 1;
-
-    companion object {
-        <!CONFLICTING_JVM_DECLARATIONS!>val clash<!> = 1;
-    }
-}

compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt

@@ -1,17 +0,0 @@
-package
-
-public final class A {
-    public constructor A()
-    @field:kotlin.jvm.JvmField public final val clash: kotlin.Int = 1
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        public final val clash: kotlin.Int = 1
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}

compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.fir.kt

@@ -1,14 +0,0 @@
-// MODULE: lib
-// FILE: TestA.java
-
-public abstract class TestA {
-    public abstract int getProp();
-}
-
-// MODULE: main(lib)
-// FILE: TestB.kt
-
-abstract class TestB : TestA() {
-    @JvmField
-    protected var prop: Int = 0
-}

compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt

@@ -1,14 +0,0 @@
-// MODULE: lib
-// FILE: TestA.java
-
-public abstract class TestA {
-    public abstract int getProp();
-}
-
-// MODULE: main(lib)
-// FILE: TestB.kt
-
-abstract class TestB : TestA() {
-    <!ACCIDENTAL_OVERRIDE!>@JvmField
-    protected var prop: Int<!> = 0
-}

compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.txt

@@ -1,23 +0,0 @@
-// -- Module: <lib> --
-package
-
-public abstract class TestA {
-    public constructor TestA()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun getProp(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-// -- Module: <main> --
-package
-
-public abstract class TestB : TestA {
-    public constructor TestB()
-    @field:kotlin.jvm.JvmField protected final var prop: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun getProp(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -30820,12 +30820,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.kt");
       }
 
-      @Test
-      @TestMetadata("typeParameterWithTwoBounds.kt")
-      public void testTypeParameterWithTwoBounds() {
-        runTest("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt");
-      }
-
       @Nested
       @TestMetadata("compiler/testData/diagnostics/tests/redeclarations/shadowedExtension")
       @TestDataPath("$PROJECT_ROOT")
@@ -41897,12 +41891,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
       runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
     }
 
-    @Test
-    @TestMetadata("jvmFieldAndJavaGetter.kt")
-    public void testJvmFieldAndJavaGetter() {
-      runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
-    }
-
     @Test
     @TestMetadata("kt54410.kt")
     public void testKt54410() {
@@ -42485,12 +42473,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
           KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
         }
 
-        @Test
-        @TestMetadata("clashWithCompanionObjectField.kt")
-        public void testClashWithCompanionObjectField() {
-          runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt");
-        }
-
         @Test
         @TestMetadata("inMultiFileFacade.kt")
         public void testInMultiFileFacade() {