diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt b/compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt similarity index 96% rename from compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt rename to compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt index 74efbf95a54..ad9220cdb6a 100644 --- a/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt +++ b/compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.lang.annotation.Repeatable @java.lang.annotation.Repeatable(Annotations::class) annotation class RepAnn diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.txt b/compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.txt rename to compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt b/compiler/testData/diagnostics/tests/annotations/javaRepeatable.kt similarity index 89% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt rename to compiler/testData/diagnostics/tests/annotations/javaRepeatable.kt index 77e0675a678..39077346f99 100644 --- a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt +++ b/compiler/testData/diagnostics/tests/annotations/javaRepeatable.kt @@ -1,20 +1,19 @@ +// FULL_JDK // FILE: RepeatableAnnotation.java import java.lang.annotation.Repeatable @Repeatable(RepeatableAnnotations.class) public @interface RepeatableAnnotation { - } // FILE: RepeatableAnnotations.java public @interface RepeatableAnnotations { - RepeatableAnnotation[] value(); + RepeatableAnnotation[] value(); } // FILE: RepeatableUse.kt // Error should be gone when Java 8 Target will be available @RepeatableAnnotation @RepeatableAnnotation class My - diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt b/compiler/testData/diagnostics/tests/annotations/javaRepeatable.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.txt rename to compiler/testData/diagnostics/tests/annotations/javaRepeatable.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt b/compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.kt similarity index 90% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt rename to compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.kt index 9a946c8615b..58eb8b083ea 100644 --- a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt +++ b/compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.kt @@ -1,3 +1,4 @@ +// FULL_JDK // FILE: RepeatableAnnotation.java import java.lang.annotation.*; @@ -5,18 +6,15 @@ import java.lang.annotation.*; @Repeatable(RepeatableAnnotations.class) @Retention(RetentionPolicy.RUNTIME) public @interface RepeatableAnnotation { - } // FILE: RepeatableAnnotations.java public @interface RepeatableAnnotations { - RepeatableAnnotation[] value(); + RepeatableAnnotation[] value(); } // FILE: RepeatableUse.kt // Error should be gone when Java 8 Target will be available @RepeatableAnnotation @RepeatableAnnotation class My - - diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.txt b/compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.txt rename to compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.kt b/compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.kt rename to compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.txt b/compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.txt rename to compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.txt diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt similarity index 100% rename from compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.kt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.txt similarity index 100% rename from compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.txt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.txt diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt similarity index 100% rename from compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.kt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.txt similarity index 100% rename from compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.txt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.kt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.txt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.kt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.txt rename to compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/collectorInference.kt b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt similarity index 96% rename from compiler/testData/diagnostics/testsWithJava8/collectorInference.kt rename to compiler/testData/diagnostics/tests/j+k/collectorInference.kt index 7c393935c73..183f0c1519e 100644 --- a/compiler/testData/diagnostics/testsWithJava8/collectorInference.kt +++ b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt @@ -1,5 +1,7 @@ // !CHECK_TYPE // SKIP_TXT +// FULL_JDK + import java.util.stream.Collectors import java.util.stream.Stream diff --git a/compiler/testData/diagnostics/testsWithJava8/defaultMethods.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/defaultMethods.kt rename to compiler/testData/diagnostics/tests/j+k/defaultMethods.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/defaultMethods.txt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/defaultMethods.txt rename to compiler/testData/diagnostics/tests/j+k/defaultMethods.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/defaultMethodsIndirectInheritance.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/defaultMethodsIndirectInheritance.kt rename to compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/defaultMethodsIndirectInheritance.txt b/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/defaultMethodsIndirectInheritance.txt rename to compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.kt b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.kt rename to compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.txt b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.txt rename to compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.kt b/compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.kt similarity index 95% rename from compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.kt rename to compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.kt index e27ded0f05b..b3ac1902278 100644 --- a/compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.kt +++ b/compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.util.* import java.util.stream.Stream diff --git a/compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.txt b/compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.txt rename to compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/samWithConsumer.kt b/compiler/testData/diagnostics/tests/j+k/samWithConsumer.kt similarity index 96% rename from compiler/testData/diagnostics/testsWithJava8/samWithConsumer.kt rename to compiler/testData/diagnostics/tests/j+k/samWithConsumer.kt index cc5fa229e7b..6480f97c171 100644 --- a/compiler/testData/diagnostics/testsWithJava8/samWithConsumer.kt +++ b/compiler/testData/diagnostics/tests/j+k/samWithConsumer.kt @@ -1,4 +1,5 @@ // !CHECK_TYPE +// FULL_JDK // FILE: A.java import java.util.function.Consumer; diff --git a/compiler/testData/diagnostics/testsWithJava8/samWithConsumer.txt b/compiler/testData/diagnostics/tests/j+k/samWithConsumer.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/samWithConsumer.txt rename to compiler/testData/diagnostics/tests/j+k/samWithConsumer.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.kt b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.kt similarity index 91% rename from compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.kt rename to compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.kt index 5f57b70f762..3fb99cd2976 100644 --- a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.kt +++ b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.kt @@ -1,3 +1,5 @@ +// FULL_JDK + class C1 : java.util.Hashtable() class C2 : java.util.Hashtable() { override fun get(key: String) = 123 diff --git a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.txt b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.txt rename to compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.kt b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.kt similarity index 84% rename from compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.kt rename to compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.kt index 10680615c68..9a532723211 100644 --- a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.kt +++ b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.security.Provider class Example : Provider("A", 1.0, "B") diff --git a/compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.txt b/compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.txt rename to compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/staticMethodInClass.kt b/compiler/testData/diagnostics/tests/j+k/staticMethodInClass.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/staticMethodInClass.kt rename to compiler/testData/diagnostics/tests/j+k/staticMethodInClass.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/staticMethodInClass.txt b/compiler/testData/diagnostics/tests/j+k/staticMethodInClass.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/staticMethodInClass.txt rename to compiler/testData/diagnostics/tests/j+k/staticMethodInClass.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.txt similarity index 54% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.txt index 592c40239e7..b8893d29870 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.txt @@ -9,9 +9,8 @@ public abstract class Test1 : kotlin.collections.Map): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - public final override /*1*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String + public final fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -24,26 +23,16 @@ public abstract class Test2 : kotlin.collections.MutableMap public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.BiFunction): kotlin.String? - public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.Function): kotlin.String - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.BiFunction): kotlin.String? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String, /*2*/ p2: java.util.function.BiFunction): kotlin.String? public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String): kotlin.String? public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.Boolean - public final override /*1*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? - public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String, /*2*/ p2: kotlin.String): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.BiFunction): kotlin.Unit + public final fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -57,25 +46,15 @@ public abstract class Test3 : java.util.AbstractMap public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any! - public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: kotlin.String!, /*1*/ p1: java.util.function.BiFunction): kotlin.String? - public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: kotlin.String!, /*1*/ p1: java.util.function.Function): kotlin.String! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: kotlin.String!, /*1*/ p1: java.util.function.BiFunction): kotlin.String? public final override /*1*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String!): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String!, /*1*/ defaultValue: kotlin.String!): kotlin.String! 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 merge(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String, /*2*/ p2: java.util.function.BiFunction): kotlin.String? public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.String!): kotlin.String? public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String!): kotlin.String? public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String!): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.String!): kotlin.Boolean - public final override /*1*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? - public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.BiFunction): kotlin.Unit + public final fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.txt similarity index 81% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.txt index a651825fec4..e52739f2705 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.txt @@ -8,9 +8,7 @@ public interface IBaseWithKotlinDeclaration : kotlin.collections.Map): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -27,9 +25,8 @@ public final class TestNoDelegationToDefaultMethods : WithDelegation { public final override /*1*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - public final override /*1*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String + public final fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public final fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -46,9 +43,8 @@ public abstract class TestNoDelegationToDefaultMethods2 : WithDelegation2 { public final override /*1*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - public final override /*1*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String + public final fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public final override /*1*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -65,9 +61,7 @@ public open class WithDelegation : kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*delegation*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -83,9 +77,7 @@ public abstract class WithDelegation2 : kotlin.collections.Map): kotlin.Unit public open override /*2*/ /*delegation*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*2*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*delegation*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt similarity index 77% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt index cbe766ce7ee..0e2575682c2 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.txt @@ -8,9 +8,7 @@ public interface IBase : kotlin.collections.Map { public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -24,9 +22,7 @@ public interface TestDerivedInterfaceDefault : IBase { public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -41,9 +37,7 @@ public interface TestDerivedInterfaceHiding : IBase { public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt similarity index 78% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt index dc5e3a069fd..a26574bc8ae 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.txt @@ -8,9 +8,7 @@ public interface IBaseWithKotlinDeclaration : kotlin.collections.Map): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -25,9 +23,7 @@ public interface TestDerivedInterfaceDefaultWithKotlinDeclaration : IBaseWithKot public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? @@ -42,9 +38,7 @@ public interface TestDerivedInterfaceHidingWithKotlinDeclaration : IBaseWithKotl public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun replace(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt similarity index 82% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt index 4b84cc6a344..6d351df45be 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.txt @@ -4,17 +4,17 @@ public final class ControlFlowException : kotlin.Exception /* = java.lang.Except public constructor ControlFlowException() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? - public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ p0: kotlin.Throwable!): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ fun fillInStackTrace(): ControlFlowException public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String! public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>! public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ p0: kotlin.Throwable!): kotlin.Throwable! + public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable! public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ p0: java.io.PrintStream!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ p0: java.io.PrintWriter!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ p0: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.kt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt new file mode 100644 index 00000000000..eb0cddc72d8 --- /dev/null +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt @@ -0,0 +1,55 @@ +package + +public final class MyHashMap : java.util.HashMap { + public constructor MyHashMap() + public open override /*1*/ /*fake_override*/ val entries: kotlin.collections.MutableSet> + invisible_fake final override /*1*/ /*fake_override*/ var entrySet: kotlin.collections.(Mutable)Set!>! + invisible_fake final override /*1*/ /*fake_override*/ var hashSeed: kotlin.Int + invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set! + public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet + invisible_fake final override /*1*/ /*fake_override*/ val loadFactor: kotlin.Float + invisible_fake final override /*1*/ /*fake_override*/ var modCount: kotlin.Int + invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int + public open override /*1*/ /*fake_override*/ val size: kotlin.Int + invisible_fake final override /*1*/ /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Entry!>! + invisible_fake final override /*1*/ /*fake_override*/ var threshold: kotlin.Int + invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.collections.(Mutable)Collection! + public open override /*1*/ /*fake_override*/ val values: kotlin.collections.MutableCollection + invisible_fake open override /*1*/ /*fake_override*/ fun addEntry(/*0*/ hash: kotlin.Int, /*1*/ key: kotlin.String!, /*2*/ value: kotlin.String!, /*3*/ bucketIndex: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun capacity(): kotlin.Int + 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 containsKey(/*0*/ key: kotlin.String): kotlin.Boolean + invisible_fake open override /*1*/ /*fake_override*/ fun containsNullValue(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean + invisible_fake open override /*1*/ /*fake_override*/ fun createEntry(/*0*/ hash: kotlin.Int, /*1*/ key: kotlin.String!, /*2*/ value: kotlin.String!, /*3*/ bucketIndex: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun entrySet0(): kotlin.collections.(Mutable)Set!>! + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? + invisible_fake final override /*1*/ /*fake_override*/ fun getEntry(/*0*/ key: kotlin.Any!): java.util.HashMap.Entry! + invisible_fake open override /*1*/ /*fake_override*/ fun getForNullKey(): kotlin.String! + public final fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String + invisible_fake final override /*1*/ /*fake_override*/ fun hash(/*0*/ k: kotlin.Any!): kotlin.Int + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + invisible_fake open override /*1*/ /*fake_override*/ fun inflateTable(/*0*/ toSize: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun init(): kotlin.Unit + invisible_fake final override /*1*/ /*fake_override*/ fun initHashSeedAsNeeded(/*0*/ capacity: kotlin.Int): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + invisible_fake open override /*1*/ /*fake_override*/ fun loadFactor(): kotlin.Float + invisible_fake open override /*1*/ /*fake_override*/ fun newEntryIterator(): kotlin.collections.(Mutable)Iterator!>! + invisible_fake open override /*1*/ /*fake_override*/ fun newKeyIterator(): kotlin.collections.(Mutable)Iterator! + invisible_fake open override /*1*/ /*fake_override*/ fun newValueIterator(): kotlin.collections.(Mutable)Iterator! + public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? + public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun putAllForCreate(/*0*/ m: (kotlin.collections.MutableMap..kotlin.collections.Map?)): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun putForCreate(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.String!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun putForNullKey(/*0*/ value: kotlin.String!): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String): kotlin.String? + invisible_fake final override /*1*/ /*fake_override*/ fun removeEntryForKey(/*0*/ key: kotlin.Any!): java.util.HashMap.Entry! + invisible_fake final override /*1*/ /*fake_override*/ fun removeMapping(/*0*/ o: kotlin.Any!): java.util.HashMap.Entry! + invisible_fake open override /*1*/ /*fake_override*/ fun resize(/*0*/ newCapacity: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + invisible_fake open override /*1*/ /*fake_override*/ fun transfer(/*0*/ newTable: kotlin.Array<(out) java.util.HashMap.Entry<(raw) kotlin.Any!, (raw) kotlin.Any!>!>!, /*1*/ rehash: kotlin.Boolean): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit +} diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt similarity index 97% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt index b3a808d6ae8..23ac45b6830 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.util.concurrent.* val concurrent: ConcurrentMap = null!! diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.kt similarity index 98% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.kt index faf6de77ee2..7e816910275 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.util.function.Consumer abstract class MyIt1 : Iterator { diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.kt similarity index 98% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.kt index 5497af5215c..ec0052ba754 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.kt @@ -1,3 +1,5 @@ +// FULL_JDK + abstract class A : Map fun foo(x: Map, a: A, b: java.util.HashMap) { diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt similarity index 98% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt index 9d576f29f5e..b0a4a912026 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt @@ -1,4 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -PARAMETER_NAME_CHANGED_ON_OVERRIDE +// FULL_JDK class KotlinMap1 : java.util.AbstractMap() { override val entries: MutableSet> diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.kt similarity index 95% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.kt index 4db077c6b7b..9d060661f41 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.util.stream.* interface A : MutableCollection { diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/stream.kt similarity index 96% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.kt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/stream.kt index 13864af41c9..c4741ee9902 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.kt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/stream.kt @@ -1,3 +1,5 @@ +// FULL_JDK + import java.util.stream.* interface A : Collection { diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/stream.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.txt rename to compiler/testData/diagnostics/tests/targetedBuiltIns/stream.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt deleted file mode 100644 index 25f5d549cd3..00000000000 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.txt +++ /dev/null @@ -1,59 +0,0 @@ -package - -public final class MyHashMap : java.util.HashMap { - public constructor MyHashMap() - public open override /*1*/ /*fake_override*/ val entries: kotlin.collections.MutableSet> - invisible_fake final override /*1*/ /*fake_override*/ var entrySet: kotlin.collections.(Mutable)Set!>! - invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set! - public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet - invisible_fake final override /*1*/ /*fake_override*/ val loadFactor: kotlin.Float - invisible_fake final override /*1*/ /*fake_override*/ var modCount: kotlin.Int - invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int - public open override /*1*/ /*fake_override*/ val size: kotlin.Int - invisible_fake final override /*1*/ /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Node!>! - invisible_fake final override /*1*/ /*fake_override*/ var threshold: kotlin.Int - invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.collections.(Mutable)Collection! - public open override /*1*/ /*fake_override*/ val values: kotlin.collections.MutableCollection - invisible_fake open override /*1*/ /*fake_override*/ fun afterNodeAccess(/*0*/ p0: java.util.HashMap.Node!): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun afterNodeInsertion(/*0*/ p0: kotlin.Boolean): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun afterNodeRemoval(/*0*/ p0: java.util.HashMap.Node!): kotlin.Unit - invisible_fake final override /*1*/ /*fake_override*/ fun capacity(): kotlin.Int - 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 compute(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.BiFunction): kotlin.String? - public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.Function): kotlin.String - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: kotlin.String, /*1*/ p1: java.util.function.BiFunction): kotlin.String? - public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.String): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.String): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.String): kotlin.String? - invisible_fake final override /*1*/ /*fake_override*/ fun getNode(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Any!): java.util.HashMap.Node! - public final override /*1*/ fun getOrDefault(/*0*/ key: kotlin.String, /*1*/ defaultValue: kotlin.String): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - invisible_fake open override /*1*/ /*fake_override*/ fun internalWriteEntries(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - invisible_fake final override /*1*/ /*fake_override*/ fun loadFactor(): kotlin.Float - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String, /*2*/ p2: java.util.function.BiFunction): kotlin.String? - invisible_fake open override /*1*/ /*fake_override*/ fun newNode(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: java.util.HashMap.Node!): java.util.HashMap.Node! - invisible_fake open override /*1*/ /*fake_override*/ fun newTreeNode(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: java.util.HashMap.Node!): java.util.HashMap.TreeNode! - public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.String? - public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String): kotlin.String? - invisible_fake final override /*1*/ /*fake_override*/ fun putMapEntries(/*0*/ p0: (kotlin.collections.MutableMap..kotlin.collections.Map?), /*1*/ p1: kotlin.Boolean): kotlin.Unit - invisible_fake final override /*1*/ /*fake_override*/ fun putVal(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: kotlin.Boolean, /*4*/ p4: kotlin.Boolean): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun reinitialize(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String): kotlin.String? - public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.String, /*1*/ value: kotlin.String): kotlin.Boolean - invisible_fake final override /*1*/ /*fake_override*/ fun removeNode(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Any!, /*2*/ p2: kotlin.Any!, /*3*/ p3: kotlin.Boolean, /*4*/ p4: kotlin.Boolean): java.util.HashMap.Node! - public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String): kotlin.String? - public open override /*1*/ /*fake_override*/ fun replace(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String, /*2*/ p2: kotlin.String): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.BiFunction): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun replacementNode(/*0*/ p0: java.util.HashMap.Node!, /*1*/ p1: java.util.HashMap.Node!): java.util.HashMap.Node! - invisible_fake open override /*1*/ /*fake_override*/ fun replacementTreeNode(/*0*/ p0: java.util.HashMap.Node!, /*1*/ p1: java.util.HashMap.Node!): java.util.HashMap.TreeNode! - invisible_fake final override /*1*/ /*fake_override*/ fun resize(): kotlin.Array<(out) java.util.HashMap.Node!>! - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - invisible_fake final override /*1*/ /*fake_override*/ fun treeifyBin(/*0*/ p0: kotlin.Array<(out) java.util.HashMap.Node!>!, /*1*/ p1: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/testsWithJava8/patternCompileCallableReference.kt b/compiler/testData/diagnostics/testsWithStdLib/java/patternCompileCallableReference.kt similarity index 92% rename from compiler/testData/diagnostics/testsWithJava8/patternCompileCallableReference.kt rename to compiler/testData/diagnostics/testsWithStdLib/java/patternCompileCallableReference.kt index 7342800b750..ed1d3830493 100644 --- a/compiler/testData/diagnostics/testsWithJava8/patternCompileCallableReference.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/java/patternCompileCallableReference.kt @@ -1,4 +1,6 @@ +// FULL_JDK // SKIP_TXT + import java.util.regex.Pattern val strs: List = listOf("regex1", "regex2") diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.kt similarity index 98% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt rename to compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.kt index a280687db33..7a74b6f6029 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.kt @@ -1,3 +1,5 @@ +// FULL_JDK + abstract class A : MutableList { override fun sort(/*0*/ p0: java.util.Comparator) { super.sort(p0) diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.txt similarity index 100% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt rename to compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.txt diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt similarity index 99% rename from compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt rename to compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt index be3268b47e4..21443a83e00 100644 --- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt @@ -1,6 +1,7 @@ // !CHECK_TYPE // !LANGUAGE: -AdditionalBuiltInsMembers // SKIP_TXT +// FULL_JDK class A : java.util.ArrayList() { // `stream` is defined in ArrayList, so it was impossible to override it in 1.0 diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java deleted file mode 100644 index 6d92e0a79b5..00000000000 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.checkers; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/diagnostics/testsWithJava8") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class DiagnosticsWithJava8TestGenerated extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInTestsWithJava8() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("collectorInference.kt") - public void testCollectorInference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/collectorInference.kt"); - doTest(fileName); - } - - @TestMetadata("defaultMethods.kt") - public void testDefaultMethods() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/defaultMethods.kt"); - doTest(fileName); - } - - @TestMetadata("defaultMethodsIndirectInheritance.kt") - public void testDefaultMethodsIndirectInheritance() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/defaultMethodsIndirectInheritance.kt"); - doTest(fileName); - } - - @TestMetadata("nullForOptionalOrElse.kt") - public void testNullForOptionalOrElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/nullForOptionalOrElse.kt"); - doTest(fileName); - } - - @TestMetadata("patternCompileCallableReference.kt") - public void testPatternCompileCallableReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/patternCompileCallableReference.kt"); - doTest(fileName); - } - - @TestMetadata("samWithConsumer.kt") - public void testSamWithConsumer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/samWithConsumer.kt"); - doTest(fileName); - } - - @TestMetadata("staticMethodInClass.kt") - public void testStaticMethodInClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/staticMethodInClass.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/annotations") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInAnnotations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/annotations"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("deprecatedRepeatable.kt") - public void testDeprecatedRepeatable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt"); - doTest(fileName); - } - - @TestMetadata("javaRepeatable.kt") - public void testJavaRepeatable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt"); - doTest(fileName); - } - - @TestMetadata("javaRepeatableRetention.kt") - public void testJavaRepeatableRetention() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt"); - doTest(fileName); - } - - @TestMetadata("javaUnrepeatable.kt") - public void testJavaUnrepeatable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInStatics() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("jjk.kt") - public void testJjk() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.kt"); - doTest(fileName); - } - - @TestMetadata("jk.kt") - public void testJk() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.kt"); - doTest(fileName); - } - } - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/specialBuiltIns") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class SpecialBuiltIns extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInSpecialBuiltIns() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/specialBuiltIns"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("hashtableInheritance.kt") - public void testHashtableInheritance() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/hashtableInheritance.kt"); - doTest(fileName); - } - - @TestMetadata("securityProvider.kt") - public void testSecurityProvider() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/specialBuiltIns/securityProvider.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/statics") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInStatics() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/statics"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("inheritanceStaticMethodFromInterface.kt") - public void testInheritanceStaticMethodFromInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class TargetedBuiltIns extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInTargetedBuiltIns() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("blackListed.kt") - public void testBlackListed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt"); - doTest(fileName); - } - - @TestMetadata("concurrentMapRemove.kt") - public void testConcurrentMapRemove() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/concurrentMapRemove.kt"); - doTest(fileName); - } - - @TestMetadata("forEachRemainingNullability.kt") - public void testForEachRemainingNullability() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/forEachRemainingNullability.kt"); - doTest(fileName); - } - - @TestMetadata("getOrDefault.kt") - public void testGetOrDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/getOrDefault.kt"); - doTest(fileName); - } - - @TestMetadata("mutableMapRemove.kt") - public void testMutableMapRemove() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/mutableMapRemove.kt"); - doTest(fileName); - } - - @TestMetadata("removeIf.kt") - public void testRemoveIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/removeIf.kt"); - doTest(fileName); - } - - @TestMetadata("stream.kt") - public void testStream() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/stream.kt"); - doTest(fileName); - } - - @TestMetadata("unsupportedFeature.kt") - public void testUnsupportedFeature() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BackwardCompatibility extends AbstractDiagnosticsWithFullJdkTest { - public void testAllFilesPresentInBackwardCompatibility() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("basic.kt") - public void testBasic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt"); - doTest(fileName); - } - - @TestMetadata("delegation.kt") - public void testDelegation() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt"); - doTest(fileName); - } - - @TestMetadata("derivedInterfaces.kt") - public void testDerivedInterfaces() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt"); - doTest(fileName); - } - - @TestMetadata("derivedInterfacesWithKotlinFun.kt") - public void testDerivedInterfacesWithKotlinFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt"); - doTest(fileName); - } - - @TestMetadata("fillInStackTrace.kt") - public void testFillInStackTrace() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt"); - doTest(fileName); - } - - @TestMetadata("finalize.kt") - public void testFinalize() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt"); - doTest(fileName); - } - - @TestMetadata("hashMapGetOrDefault.kt") - public void testHashMapGetOrDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt"); - doTest(fileName); - } - } - } -} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java deleted file mode 100644 index 26f6a492846..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.checkers; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.TestJdkKind; - -import java.io.File; - -public abstract class AbstractDiagnosticsWithFullJdkTest extends AbstractDiagnosticsTest { - @NotNull - @Override - protected ConfigurationKind getConfigurationKind() { - return ConfigurationKind.ALL; - } - - @NotNull - @Override - protected TestJdkKind getTestJdkKind(@NotNull File file) { - return TestJdkKind.FULL_JDK; - } -} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index 8c43b016537..1a4d44d87a4 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -17,15 +17,17 @@ package org.jetbrains.kotlin.checkers import org.jetbrains.kotlin.config.* +import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.utils.Jsr305State import java.io.File val FOREIGN_ANNOTATIONS_SOURCES_PATH = "compiler/testData/foreignAnnotations/annotations" val TEST_ANNOTATIONS_SOURCE_PATH = "compiler/testData/foreignAnnotations/testAnnotations" -abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsWithFullJdkTest() { +abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { private val WARNING_FOR_JSR305_ANNOTATIONS_DIRECTIVE = "WARNING_FOR_JSR305_ANNOTATIONS" override fun getExtraClasspath(): List { @@ -40,6 +42,10 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsWithFullJdkTe extraClasspath = extraClassPath.map { it.path } )) + override fun getConfigurationKind(): ConfigurationKind = ConfigurationKind.ALL + + override fun getTestJdkKind(file: File): TestJdkKind = TestJdkKind.FULL_JDK + open protected val annotationsPath: String get() = FOREIGN_ANNOTATIONS_SOURCES_PATH diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index 6dbc233beb9..b018a8bff9a 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -1054,6 +1054,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("deprecatedRepeatable.kt") + public void testDeprecatedRepeatable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.kt"); + doTest(fileName); + } + @TestMetadata("extensionFunctionType.kt") public void testExtensionFunctionType() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt"); @@ -1084,6 +1090,24 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("javaRepeatable.kt") + public void testJavaRepeatable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/javaRepeatable.kt"); + doTest(fileName); + } + + @TestMetadata("javaRepeatableRetention.kt") + public void testJavaRepeatableRetention() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/javaRepeatableRetention.kt"); + doTest(fileName); + } + + @TestMetadata("javaUnrepeatable.kt") + public void testJavaUnrepeatable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/javaUnrepeatable.kt"); + doTest(fileName); + } + @TestMetadata("kt1860-negative.kt") public void testKt1860_negative() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt"); @@ -7140,24 +7164,36 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("jjk.kt") - public void testJjk() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.kt"); - doTest(fileName); - } - - @TestMetadata("jk.kt") - public void testJk() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.kt"); - doTest(fileName); - } - @TestMetadata("jkjk.kt") public void testJkjk() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); doTest(fileName); } + @TestMetadata("kotlinClassExtendsJavaClass.kt") + public void testKotlinClassExtendsJavaClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); + doTest(fileName); + } + + @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") + public void testKotlinClassExtendsJavaClassExtendsJavaClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); + doTest(fileName); + } + + @TestMetadata("kotlinClassImplementsJavaInterface.kt") + public void testKotlinClassImplementsJavaInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); + doTest(fileName); + } + + @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") + public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); + doTest(fileName); + } + @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); @@ -12016,6 +12052,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("collectorInference.kt") + public void testCollectorInference() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectorInference.kt"); + doTest(fileName); + } + @TestMetadata("computeIfAbsentConcurrent.kt") public void testComputeIfAbsentConcurrent() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.kt"); @@ -12028,6 +12070,18 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("defaultMethods.kt") + public void testDefaultMethods() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/defaultMethods.kt"); + doTest(fileName); + } + + @TestMetadata("defaultMethodsIndirectInheritance.kt") + public void testDefaultMethodsIndirectInheritance() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt"); + doTest(fileName); + } + @TestMetadata("differentFilename.kt") public void testDifferentFilename() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/differentFilename.kt"); @@ -12088,6 +12142,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("inheritanceStaticMethodFromInterface.kt") + public void testInheritanceStaticMethodFromInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt"); + doTest(fileName); + } + @TestMetadata("InheritedGenericFunction.kt") public void testInheritedGenericFunction() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.kt"); @@ -12220,6 +12280,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("nullForOptionalOrElse.kt") + public void testNullForOptionalOrElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/nullForOptionalOrElse.kt"); + doTest(fileName); + } + @TestMetadata("overrideRawType.kt") public void testOverrideRawType() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideRawType.kt"); @@ -12298,6 +12364,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("samWithConsumer.kt") + public void testSamWithConsumer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/samWithConsumer.kt"); + doTest(fileName); + } + @TestMetadata("selectMoreSpecific.kt") public void testSelectMoreSpecific() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/selectMoreSpecific.kt"); @@ -12334,6 +12406,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { doTest(fileName); } + @TestMetadata("staticMethodInClass.kt") + public void testStaticMethodInClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/staticMethodInClass.kt"); + doTest(fileName); + } + @TestMetadata("SupertypeArgumentsNullability-NotNull-SpecialTypes.kt") public void testSupertypeArgumentsNullability_NotNull_SpecialTypes() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.kt"); @@ -12739,6 +12817,27 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { } } + @TestMetadata("compiler/testData/diagnostics/tests/j+k/specialBuiltIns") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SpecialBuiltIns extends AbstractDiagnosticsTest { + public void testAllFilesPresentInSpecialBuiltIns() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/specialBuiltIns"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("hashtableInheritance.kt") + public void testHashtableInheritance() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/specialBuiltIns/hashtableInheritance.kt"); + doTest(fileName); + } + + @TestMetadata("securityProvider.kt") + public void testSecurityProvider() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/specialBuiltIns/securityProvider.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/diagnostics/tests/j+k/types") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -22427,6 +22526,102 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { } } + @TestMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TargetedBuiltIns extends AbstractDiagnosticsTest { + public void testAllFilesPresentInTargetedBuiltIns() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/targetedBuiltIns"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("concurrentMapRemove.kt") + public void testConcurrentMapRemove() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt"); + doTest(fileName); + } + + @TestMetadata("forEachRemainingNullability.kt") + public void testForEachRemainingNullability() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.kt"); + doTest(fileName); + } + + @TestMetadata("getOrDefault.kt") + public void testGetOrDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.kt"); + doTest(fileName); + } + + @TestMetadata("mutableMapRemove.kt") + public void testMutableMapRemove() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt"); + doTest(fileName); + } + + @TestMetadata("removeIf.kt") + public void testRemoveIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/removeIf.kt"); + doTest(fileName); + } + + @TestMetadata("stream.kt") + public void testStream() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/stream.kt"); + doTest(fileName); + } + + @TestMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class BackwardCompatibility extends AbstractDiagnosticsTest { + public void testAllFilesPresentInBackwardCompatibility() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("basic.kt") + public void testBasic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/basic.kt"); + doTest(fileName); + } + + @TestMetadata("delegation.kt") + public void testDelegation() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/delegation.kt"); + doTest(fileName); + } + + @TestMetadata("derivedInterfaces.kt") + public void testDerivedInterfaces() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfaces.kt"); + doTest(fileName); + } + + @TestMetadata("derivedInterfacesWithKotlinFun.kt") + public void testDerivedInterfacesWithKotlinFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt"); + doTest(fileName); + } + + @TestMetadata("fillInStackTrace.kt") + public void testFillInStackTrace() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/fillInStackTrace.kt"); + doTest(fileName); + } + + @TestMetadata("finalize.kt") + public void testFinalize() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.kt"); + doTest(fileName); + } + + @TestMetadata("hashMapGetOrDefault.kt") + public void testHashMapGetOrDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/hashMapGetOrDefault.kt"); + doTest(fileName); + } + } + } + @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index 46644d68d6a..6166d62dfbb 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -1320,6 +1320,21 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/java") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Java extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInJava() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/java"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("patternCompileCallableReference.kt") + public void testPatternCompileCallableReference() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/java/patternCompileCallableReference.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kt7585") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1752,6 +1767,27 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TargetedBuiltIns extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInTargetedBuiltIns() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("blackListed.kt") + public void testBlackListed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/blackListed.kt"); + doTest(fileName); + } + + @TestMetadata("unsupportedFeature.kt") + public void testUnsupportedFeature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/typealias") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 8812551475e..0038d356b85 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -468,10 +468,6 @@ fun main(args: Array) { model("codegen/java8/box") } - testClass("DiagnosticsWithJava8TestGenerated") { - model("diagnostics/testsWithJava8") - } - testClass { model("foreignAnnotationsJava8/tests") }