From dfb1cb864278dc4c367f93df8578d9d0d378abee Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 15 Aug 2019 14:21:25 +0300 Subject: [PATCH] Minor. Rename UnknownNullness -> NullnessUnknown --- .../annotatedWildcards.kt | 2 +- .../annotatedWildcards.txt | 4 +- .../ignoreAnnotations.kt | 2 +- .../ignoreAnnotations.txt | 2 +- .../tests/jspecify/simple.kt | 2 +- .../tests/jspecify/simple.txt | 2 +- .../typeArgumentsFromParameterBounds.kt | 2 +- .../typeArgumentsFromParameterBounds.txt | 4 +- .../warnings/annotatedWildcards.kt | 2 +- .../warnings/annotatedWildcards.txt | 4 +- .../warnings/defaults.kt | 0 .../warnings/defaults.txt | 0 .../warnings/nonPlatformTypeParameter.kt | 0 .../warnings/nonPlatformTypeParameter.txt | 0 .../warnings/simple.kt | 2 +- .../warnings/simple.txt | 2 +- .../typeArgumentsFromParameterBounds.kt | 2 +- .../typeArgumentsFromParameterBounds.txt | 6 +- .../warnings/typeParameterBounds.kt | 0 .../warnings/typeParameterBounds.txt | 0 .../warnings/unknownNullnessTypeParameter.kt | 0 .../warnings/unknownNullnessTypeParameter.txt | 0 .../warnings/wildcardsWithDefault.kt | 2 +- .../warnings/wildcardsWithDefault.txt | 4 +- .../wildcardsWithDefault.kt | 2 +- .../wildcardsWithDefault.txt | 6 +- ...sNoAnnotationInClasspathTestGenerated.java | 149 ++++++++---------- ...spathWithPsiClassReadingTestGenerated.java | 149 ++++++++---------- .../ForeignJava8AnnotationsTestGenerated.java | 149 ++++++++---------- ...cForeignJava8AnnotationsTestGenerated.java | 149 ++++++++---------- .../IrJsCodegenBoxTestGenerated.java | 75 --------- ...nownNullness.java => NullnessUnknown.java} | 4 +- 32 files changed, 300 insertions(+), 427 deletions(-) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/annotatedWildcards.kt (98%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/annotatedWildcards.txt (94%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/ignoreAnnotations.kt (94%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/ignoreAnnotations.txt (93%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/annotatedWildcards.kt (98%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/annotatedWildcards.txt (95%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/defaults.kt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/defaults.txt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/nonPlatformTypeParameter.kt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/nonPlatformTypeParameter.txt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/simple.kt (92%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/simple.txt (90%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/typeArgumentsFromParameterBounds.kt (97%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/typeArgumentsFromParameterBounds.txt (91%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/typeParameterBounds.kt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/typeParameterBounds.txt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/unknownNullnessTypeParameter.kt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/unknownNullnessTypeParameter.txt (100%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/wildcardsWithDefault.kt (96%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/warnings/wildcardsWithDefault.txt (91%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/wildcardsWithDefault.kt (96%) rename compiler/testData/foreignAnnotationsJava8/tests/{codeanalysis => jspecify}/wildcardsWithDefault.txt (87%) rename third-party/jdk8-annotations/jspecify/annotations/{UnknownNullness.java => NullnessUnknown.java} (77%) diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt similarity index 98% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt index 4eda66c40c9..d203e2a7994 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt @@ -3,7 +3,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt similarity index 94% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt index 368fd756247..f7dcb92598f 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ aAnyNotNullNotNullNotNull: A, /*5*/ aAnyNotNullNotNullNull: A, /*6*/ aAnyNotNullNullNotNull: A, /*7*/ aAnyNotNullNullNull: A, /*8*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt similarity index 94% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt index 2c0c9be935c..c380da96501 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt @@ -8,7 +8,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @UnknownNullness CharSequence y) { + public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { return ""; } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt similarity index 93% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt index 009faf943f9..37e017d6354 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt @@ -10,7 +10,7 @@ public open class A { @jspecify.annotations.DefaultNotNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): kotlin.String! @jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): kotlin.String! @jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): kotlin.String! - @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.UnknownNullness y: kotlin.CharSequence!): kotlin.String! + @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): kotlin.String! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt index dec22f6b2ee..ac2efa003ec 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt @@ -7,7 +7,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @UnknownNullness CharSequence y) { + public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { return ""; } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt index 9232ebfbb40..30fa5fd05f9 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt @@ -7,7 +7,7 @@ public open class A { @jspecify.annotations.Nullable public final var field: kotlin.String? @jspecify.annotations.NotNull public open fun bar(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String, /*1*/ @jspecify.annotations.UnknownNullness y: kotlin.CharSequence!): kotlin.String? + @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt index bcdc30223d2..8a7481bd264 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt @@ -3,7 +3,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt index 7e05124989d..c7bbfaba312 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt similarity index 98% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt index ae6562fb736..f40193b3388 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt @@ -4,7 +4,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt similarity index 95% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt index 301fb427728..eff6486faab 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ aAnyNotNullNotNullNotNull: A, /*5*/ aAnyNotNullNotNullNull: A, /*6*/ aAnyNotNullNullNotNull: A, /*7*/ aAnyNotNullNullNull: A, /*8*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt similarity index 92% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt index 34a07d2dc68..5abcb92e706 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt @@ -8,7 +8,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @UnknownNullness CharSequence y) { + public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { return ""; } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt similarity index 90% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt index 40ee2890e21..6465a2936c6 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt @@ -7,7 +7,7 @@ public open class A { @jspecify.annotations.Nullable public final var field: kotlin.String! @jspecify.annotations.NotNull public open fun bar(): kotlin.String! public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.UnknownNullness y: kotlin.CharSequence!): kotlin.String! + @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): kotlin.String! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt similarity index 97% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt index 396e29cb7b2..e5911cbb72b 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt @@ -4,7 +4,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt similarity index 91% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt index d1d5ed3e1b2..59254108ab4 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -25,7 +25,7 @@ public open class A!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt similarity index 100% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt similarity index 96% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt index 2af615f735e..7104d835cb1 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt @@ -4,7 +4,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt similarity index 91% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt index 0954456b442..62847236483 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt similarity index 96% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt index ae07d1a15a3..72bdba8dacb 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt @@ -3,7 +3,7 @@ import jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt similarity index 87% rename from compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.txt rename to compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt index bd6159aff27..16fd26e0800 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -13,7 +13,7 @@ public open class B { public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A): kotlin.Unit + @jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A): kotlin.Unit @jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java index 9983a196179..d0f526a9048 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java @@ -43,87 +43,6 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Codeanalysis extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCodeanalysis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -136,11 +55,21 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); + } + @TestMetadata("defaults.kt") public void testDefaults() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); } + @TestMetadata("ignoreAnnotations.kt") + public void testIgnoreAnnotations() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); + } + @TestMetadata("nonPlatformTypeParameter.kt") public void testNonPlatformTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); @@ -165,6 +94,64 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends public void testUnknownNullnessTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); + } + + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInWarnings() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); + } + + @TestMetadata("defaults.kt") + public void testDefaults() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); + } + + @TestMetadata("nonPlatformTypeParameter.kt") + public void testNonPlatformTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); + } + + @TestMetadata("typeArgumentsFromParameterBounds.kt") + public void testTypeArgumentsFromParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); + } + + @TestMetadata("typeParameterBounds.kt") + public void testTypeParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); + } + + @TestMetadata("unknownNullnessTypeParameter.kt") + public void testUnknownNullnessTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); + } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); + } + } } @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java index 561b178f9ab..16f385a607d 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java @@ -43,87 +43,6 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Codeanalysis extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCodeanalysis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -136,11 +55,21 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); + } + @TestMetadata("defaults.kt") public void testDefaults() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); } + @TestMetadata("ignoreAnnotations.kt") + public void testIgnoreAnnotations() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); + } + @TestMetadata("nonPlatformTypeParameter.kt") public void testNonPlatformTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); @@ -165,6 +94,64 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe public void testUnknownNullnessTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); + } + + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInWarnings() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); + } + + @TestMetadata("defaults.kt") + public void testDefaults() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); + } + + @TestMetadata("nonPlatformTypeParameter.kt") + public void testNonPlatformTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); + } + + @TestMetadata("typeArgumentsFromParameterBounds.kt") + public void testTypeArgumentsFromParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); + } + + @TestMetadata("typeParameterBounds.kt") + public void testTypeParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); + } + + @TestMetadata("unknownNullnessTypeParameter.kt") + public void testUnknownNullnessTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); + } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); + } + } } @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java index ae84bed6985..82089913b2e 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java @@ -43,87 +43,6 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Codeanalysis extends AbstractForeignJava8AnnotationsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCodeanalysis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractForeignJava8AnnotationsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -136,11 +55,21 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); + } + @TestMetadata("defaults.kt") public void testDefaults() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); } + @TestMetadata("ignoreAnnotations.kt") + public void testIgnoreAnnotations() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); + } + @TestMetadata("nonPlatformTypeParameter.kt") public void testNonPlatformTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); @@ -165,6 +94,64 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An public void testUnknownNullnessTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); + } + + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Warnings extends AbstractForeignJava8AnnotationsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInWarnings() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); + } + + @TestMetadata("defaults.kt") + public void testDefaults() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); + } + + @TestMetadata("nonPlatformTypeParameter.kt") + public void testNonPlatformTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); + } + + @TestMetadata("typeArgumentsFromParameterBounds.kt") + public void testTypeArgumentsFromParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); + } + + @TestMetadata("typeParameterBounds.kt") + public void testTypeParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); + } + + @TestMetadata("unknownNullnessTypeParameter.kt") + public void testUnknownNullnessTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); + } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); + } + } } @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java index 78f98186eb4..a88f2ec664b 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java @@ -43,87 +43,6 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Codeanalysis extends AbstractJavacForeignJava8AnnotationsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCodeanalysis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/annotatedWildcards.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/ignoreAnnotations.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractJavacForeignJava8AnnotationsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/codeanalysis/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -136,11 +55,21 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); + } + @TestMetadata("defaults.kt") public void testDefaults() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); } + @TestMetadata("ignoreAnnotations.kt") + public void testIgnoreAnnotations() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); + } + @TestMetadata("nonPlatformTypeParameter.kt") public void testNonPlatformTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); @@ -165,6 +94,64 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore public void testUnknownNullnessTypeParameter() throws Exception { runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); + } + + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Warnings extends AbstractJavacForeignJava8AnnotationsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInWarnings() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @TestMetadata("annotatedWildcards.kt") + public void testAnnotatedWildcards() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); + } + + @TestMetadata("defaults.kt") + public void testDefaults() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); + } + + @TestMetadata("nonPlatformTypeParameter.kt") + public void testNonPlatformTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); + } + + @TestMetadata("typeArgumentsFromParameterBounds.kt") + public void testTypeArgumentsFromParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); + } + + @TestMetadata("typeParameterBounds.kt") + public void testTypeParameterBounds() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); + } + + @TestMetadata("unknownNullnessTypeParameter.kt") + public void testUnknownNullnessTypeParameter() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); + } + + @TestMetadata("wildcardsWithDefault.kt") + public void testWildcardsWithDefault() throws Exception { + runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); + } + } } @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index bd72fe2dbaa..22e0177c5bb 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -18253,11 +18253,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ranges/expression/emptyRange.kt"); } - @TestMetadata("inexactDownToMinValue.kt") - public void testInexactDownToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt"); - } - @TestMetadata("inexactSteppedDownTo.kt") public void testInexactSteppedDownTo() throws Exception { runTest("compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt"); @@ -18268,26 +18263,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt"); } - @TestMetadata("inexactToMaxValue.kt") - public void testInexactToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt"); - } - - @TestMetadata("maxValueMinusTwoToMaxValue.kt") - public void testMaxValueMinusTwoToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt"); - } - - @TestMetadata("maxValueToMaxValue.kt") - public void testMaxValueToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt"); - } - - @TestMetadata("maxValueToMinValue.kt") - public void testMaxValueToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt"); - } - @TestMetadata("oneElementDownTo.kt") public void testOneElementDownTo() throws Exception { runTest("compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt"); @@ -18303,41 +18278,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ranges/expression/openRange.kt"); } - @TestMetadata("overflowZeroDownToMaxValue.kt") - public void testOverflowZeroDownToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt"); - } - - @TestMetadata("overflowZeroToMinValue.kt") - public void testOverflowZeroToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt"); - } - - @TestMetadata("progressionDownToMinValue.kt") - public void testProgressionDownToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt"); - } - - @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt") - public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt"); - } - - @TestMetadata("progressionMaxValueToMaxValue.kt") - public void testProgressionMaxValueToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt"); - } - - @TestMetadata("progressionMaxValueToMinValue.kt") - public void testProgressionMaxValueToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt"); - } - - @TestMetadata("progressionMinValueToMinValue.kt") - public void testProgressionMinValueToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt"); - } - @TestMetadata("reversedBackSequence.kt") public void testReversedBackSequence() throws Exception { runTest("compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt"); @@ -18935,11 +18875,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ranges/literal/emptyRange.kt"); } - @TestMetadata("inexactDownToMinValue.kt") - public void testInexactDownToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt"); - } - @TestMetadata("inexactSteppedDownTo.kt") public void testInexactSteppedDownTo() throws Exception { runTest("compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt"); @@ -18985,21 +18920,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ranges/literal/openRange.kt"); } - @TestMetadata("overflowZeroDownToMaxValue.kt") - public void testOverflowZeroDownToMaxValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt"); - } - @TestMetadata("overflowZeroToMinValue.kt") public void testOverflowZeroToMinValue() throws Exception { runTest("compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt"); } - @TestMetadata("progressionDownToMinValue.kt") - public void testProgressionDownToMinValue() throws Exception { - runTest("compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt"); - } - @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt") public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception { runTest("compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt"); diff --git a/third-party/jdk8-annotations/jspecify/annotations/UnknownNullness.java b/third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java similarity index 77% rename from third-party/jdk8-annotations/jspecify/annotations/UnknownNullness.java rename to third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java index a2eb39f140d..72a6dffe56a 100644 --- a/third-party/jdk8-annotations/jspecify/annotations/UnknownNullness.java +++ b/third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -11,6 +11,6 @@ import java.lang.annotation.RetentionPolicy; @Documented @Retention(RetentionPolicy.RUNTIME) -public @interface UnknownNullness { +public @interface NullnessUnknown { }