[TD] Mute some javac tests or update their testdata

There was a refactoring of AbstractDiagnosticsTest in 9052ef06 which
  contains bug that `setupEnvironment` for AbstractDiagnosticsTestUsingJavac
  was not called, so for last year tests `UsingJavac` had no difference
  with usual diagnostics tests which causes some contradictions in test data

compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 package kotlin.sub
 
 @Deprecated("", ReplaceWith(""))

compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 package kotlin.sub
 
 @Deprecated("", ReplaceWith(""))

compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.javac.txt

@@ -74,3 +74,38 @@ public abstract class B : kotlin.collections.MutableList<kotlin.Int>, java.util.
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
+public abstract class D : java.util.AbstractList<kotlin.Int> {
+    public constructor D()
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.Int!>
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.Int!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.Int!>
+    invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
+    invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
+    public open override /*1*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.Int
+    protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Int!
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.Int!>
+    public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+

compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // FILE: SLRUMap.java
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 

compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // FILE: SLRUMap.java
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 

compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // FILE: SLRUMap.java
 // !LANGUAGE: -ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 

compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // FILE: SLRUMap.java
 // !LANGUAGE: -ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: -InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: -InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt

@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
+// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt

@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
+// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt

@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
+// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt

@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
+// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt

@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
+// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 
 package kotlin.jvm

compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER
 

compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt

@@ -1,3 +1,4 @@
+// !SKIP_JAVAC
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER
 

compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.fir.kt

@@ -1,3 +1,4 @@
+// !JAVAC_EXPECTED_FILE
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 

compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.javac.txt

@@ -0,0 +1,26 @@
+package
+
+public final class Base</*0*/ T : [ERROR : Cyclic upper bounds]> : kotlin.collections.HashSet<T> /* = java.util.HashSet<T> */ {
+    public constructor Base</*0*/ T : [ERROR : Cyclic upper bounds]>()
+    invisible_fake final override /*1*/ /*fake_override*/ var map: java.util.HashMap<T!, kotlin.Any!>!
+    public open override /*1*/ /*fake_override*/ val size: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T>
+    invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
+}

compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.kt

@@ -1,3 +1,4 @@
+// !JAVAC_EXPECTED_FILE
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER