Use JDK 8 in AbstractCompileAgainstKotlin test

Author: baratynskiy

compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt

@@ -15,6 +15,7 @@ public abstract class Mine</*0*/ T> : java.util.AbstractList<T> {
     public open /*fake_override*/ fun clear(): kotlin.Unit
     public open /*fake_override*/ fun contains(/*0*/ T!): kotlin.Boolean
     public open /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.Consumer<in T!>!): kotlin.Unit
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): T!
     public open /*fake_override*/ fun indexOf(/*0*/ T!): kotlin.Int
     public open /*fake_override*/ fun isEmpty(): kotlin.Boolean
@@ -23,13 +24,19 @@ public abstract class Mine</*0*/ T> : java.util.AbstractList<T> {
     public open /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
     public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open /*fake_override*/ fun outOfBoundsMsg(/*0*/ kotlin.Int): kotlin.String!
+    public open /*fake_override*/ fun parallelStream(): java.util.stream.Stream<T!>
     invisible_fake open /*fake_override*/ fun rangeCheckForAdd(/*0*/ kotlin.Int): kotlin.Unit
     public open /*fake_override*/ fun remove(/*0*/ T!): kotlin.Boolean
     public open /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public open /*fake_override*/ fun removeAt(/*0*/ kotlin.Int): T!
+    public open /*fake_override*/ fun removeIf(/*0*/ java.util.function.Predicate<in T!>): kotlin.Boolean
     protected/*protected and package*/ open /*fake_override*/ fun removeRange(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.Unit
+    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.UnaryOperator<T!>): kotlin.Unit
     public open /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public open /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ T!): T!
+    public open /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ java.util.Comparator<in T!>!): kotlin.Unit
+    public open /*fake_override*/ fun spliterator(): java.util.Spliterator<T!>
+    public open /*fake_override*/ fun stream(): java.util.stream.Stream<T!>
     public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.MutableList<T!>
     public open /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!

compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt

@@ -10,18 +10,25 @@ public abstract class Mine : java.util.List<kotlin.String> {
     public abstract /*fake_override*/ fun clear(): kotlin.Unit
     public abstract /*fake_override*/ fun contains(/*0*/ kotlin.String!): kotlin.Boolean
     public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.Consumer<in kotlin.String!>!): kotlin.Unit
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): kotlin.String!
     public abstract /*fake_override*/ fun indexOf(/*0*/ kotlin.Any!): kotlin.Int
     public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract /*fake_override*/ fun lastIndexOf(/*0*/ kotlin.Any!): kotlin.Int
     public abstract /*fake_override*/ fun listIterator(): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
     public abstract /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
+    public open /*fake_override*/ fun parallelStream(): java.util.stream.Stream<kotlin.String!>
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Int): kotlin.String!
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.String!): kotlin.Boolean
     public abstract /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open /*fake_override*/ fun removeIf(/*0*/ java.util.function.Predicate<in kotlin.String!>): kotlin.Boolean
+    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.UnaryOperator<kotlin.String>): kotlin.Unit
     public abstract /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.String!
+    public open /*fake_override*/ fun sort(/*0*/ java.util.Comparator<in kotlin.String!>!): kotlin.Unit
+    public open /*fake_override*/ fun spliterator(): java.util.Spliterator<kotlin.String!>
+    public open /*fake_override*/ fun stream(): java.util.stream.Stream<kotlin.String!>
     public abstract /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.(Mutable)List<kotlin.String!>!
     public abstract /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public abstract /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!

compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt

@@ -7,15 +7,26 @@ public/*package*/ open class ImplementsMapPP {
 public abstract class Mine</*0*/ P1, /*1*/ P2> : java.util.Map<P2, P1> {
     public constructor Mine</*0*/ P1, /*1*/ P2>()
     public abstract /*fake_override*/ fun clear(): kotlin.Unit
+    public open /*fake_override*/ fun compute(/*0*/ P2, /*1*/ java.util.function.BiFunction<in P2, in P1?, out P1?>): P1?
+    public open /*fake_override*/ fun computeIfAbsent(/*0*/ P2, /*1*/ java.util.function.Function<in P2, out P1>): P1
+    public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction<in P2, in P1, out P1?>): P1?
     public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean
     public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean
     public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<P2!, P1!>!>!
+    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.BiConsumer<in P2, in P1>): kotlin.Unit
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Any!): P1!
+    public open /*fake_override*/ fun getOrDefault(/*0*/ kotlin.Any!, /*1*/ P1!): P1!
     public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set<P2!>!
+    public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1, /*2*/ java.util.function.BiFunction<in P1, in P1, out P1?>): P1?
     public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1!
     public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap<out P2!, out P1!>..kotlin.collections.Map<out P2!, P1!>?)): kotlin.Unit
+    public open /*fake_override*/ fun putIfAbsent(/*0*/ P2, /*1*/ P1): P1?
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Any!): P1!
+    public open /*fake_override*/ fun remove(/*0*/ kotlin.Any!, /*1*/ kotlin.Any!): kotlin.Boolean
+    public open /*fake_override*/ fun replace(/*0*/ P2, /*1*/ P1): P1?
+    public open /*fake_override*/ fun replace(/*0*/ P2, /*1*/ P1, /*2*/ P1): kotlin.Boolean
+    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.BiFunction<in P2, in P1, out P1>): kotlin.Unit
     public abstract /*fake_override*/ fun size(): kotlin.Int
     public abstract /*fake_override*/ fun values(): kotlin.collections.(Mutable)Collection<P1!>!
 }

compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java

@@ -328,6 +328,11 @@ disposable, newConfiguration(configurationKind, jdkKind, getAnnotationsJar()), E
         );
     }
 
+    @NotNull
+    public static KotlinCoreEnvironment createEnvironmentWithFullJdkAndIdeaAnnotations(Disposable disposable) {
+        return createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(disposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK);
+    }
+
     @NotNull
     public static String getTestDataPathBase() {
         return getHomeDirectory() + "/compiler/testData";
@@ -593,7 +598,7 @@ public static boolean compileKotlinWithJava(
             @Nullable File javaErrorFile
     ) throws IOException {
         if (!ktFiles.isEmpty()) {
-            KotlinCoreEnvironment environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable);
+            KotlinCoreEnvironment environment = createEnvironmentWithFullJdkAndIdeaAnnotations(disposable);
             LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment);
         }
         else {

compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt

@@ -50,7 +50,7 @@ abstract class AbstractCompileJavaAgainstKotlinTest : TestCaseWithTmpdir() {
 
         val environment = KotlinCoreEnvironment.createForTests(
                 testRootDisposable,
-                newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out),
+                newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK, getAnnotationsJar(), out),
                 EnvironmentConfigFiles.JVM_CONFIG_FILES
         )