azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare test data for removal of separate test configurations for JDK 21

Browse Source 
^KT-58765

Now that JDK 21 was released as stable, we can remove separate test
configurations for testing the compiler with JDK 21 and reintegrate
the corresponding test data into standard test configurations.
This commit is contained in:
Stanislav Ruban
2024-01-08 18:22:41 +02:00
committed by Space Team
parent 8ed806ebe0
commit 13b3987aab
10 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.fir.kt → compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.fir.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// WITH_STDLIB
fun foo(ll: java.util.LinkedList<String>, al: ArrayList<String>, ad: ArrayDeque<String>, jad: java.util.ArrayDeque<String>) {
ll.addFirst("")
ll.addLast("")
compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt → compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// WITH_STDLIB
fun foo(ll: java.util.LinkedList<String>, al: ArrayList<String>, ad: ArrayDeque<String>, jad: java.util.ArrayDeque<String>) {
ll.addFirst("")
ll.addLast("")
compiler/testData/diagnostics/testsWithJdk21/newListMethods.diag.txt → compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.diag.txt
Vendored
+17 -16
View File
@@ -1,48 +1,49 @@
/newListMethods.kt:14:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details
/newListMethods.kt:13:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details
override fun getFirst(): T = super.getFirst()
^
/newListMethods.kt:14:40: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:13:40: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
override fun getFirst(): T = super.getFirst()
^
/newListMethods.kt:15:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details
/newListMethods.kt:14:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details
override fun getLast(): T = super.getLast()
^
/newListMethods.kt:15:39: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:14:39: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
override fun getLast(): T = super.getLast()
^
/newListMethods.kt:26:7: warning: 'getFirst(): E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:25:7: warning: 'getFirst(): E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
x.getFirst()
^
/newListMethods.kt:27:7: warning: 'getter for first: E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:26:7: warning: 'getter for first: E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
x.first // synthetic property for getFirst()
^
/newListMethods.kt:29:7: warning: 'getLast(): E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:28:7: warning: 'getLast(): E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
x.getLast()
^
/newListMethods.kt:30:7: warning: 'getter for last: E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:29:7: warning: 'getter for last: E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
x.last
^
/newListMethods.kt:38:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:37:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
y.getFirst()
^
/newListMethods.kt:39:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:38:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
y.first
^
/newListMethods.kt:41:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:40:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
y.getLast()
^
/newListMethods.kt:42:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:41:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
y.last
^
/newListMethods.kt:50:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:49:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
z.getFirst()
^
/newListMethods.kt:51:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
/newListMethods.kt:50:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead
z.first
^
/newListMethods.kt:53:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:52:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
z.getLast()
^
/newListMethods.kt:54:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
/newListMethods.kt:53:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead
z.last
^
compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt
Vendored
+23
View File
@@ -0,0 +1,23 @@
/newListMethods.fir.kt:(596,604): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(613,618): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(704,711): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(720,724): error: Function invocation 'last()' expected.
/newListMethods.fir.kt:(838,846): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(855,860): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(881,888): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(897,901): error: Function invocation 'last()' expected.
/newListMethods.fir.kt:(1015,1023): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(1032,1037): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(1058,1065): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(1074,1078): error: Function invocation 'last()' expected.
compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt → compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// ISSUE: KT-58371
// WITH_STDLIB
// RENDER_DIAGNOSTICS_FULL_TEXT
class A<T> : ArrayList<T>() {
compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt → compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// ISSUE: KT-58371
// WITH_STDLIB
// RENDER_DIAGNOSTICS_FULL_TEXT
class A<T> : ArrayList<T>() {
compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt → compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.fir.kt
Vendored
+4 -5
View File
@@ -1,5 +1,4 @@
// ISSUE: KT-64640
// WITH_STDLIB
fun bar(x: List<String>) {
x.<!UNRESOLVED_REFERENCE!>addFirst<!>("")
@@ -15,8 +14,8 @@ fun baz(x: ArrayDeque<String>, y: LinkedHashSet<String>) {
x.removeFirst()
x.removeLast()
x.addFirst("")
x.addLast("")
x.removeFirst()
x.removeLast()
y.addFirst("")
y.addLast("")
y.removeFirst()
y.removeLast()
}
compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt → compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt
Vendored
+4 -5
View File
@@ -1,5 +1,4 @@
// ISSUE: KT-64640
// WITH_STDLIB
fun bar(x: List<String>) {
x.<!UNRESOLVED_REFERENCE!>addFirst<!>("")
@@ -15,8 +14,8 @@ fun baz(x: ArrayDeque<String>, y: LinkedHashSet<String>) {
x.removeFirst()
x.removeLast()
x.addFirst("")
x.addLast("")
x.removeFirst()
x.removeLast()
y.addFirst("")
y.addLast("")
y.removeFirst()
y.removeLast()
}
compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt → compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt
Vendored
View File
compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.diag.txt
Vendored
-23
View File
@@ -1,23 +0,0 @@
/newListMethods.fir.kt:(611,619): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(628,633): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(719,726): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(735,739): error: Function invocation 'last()' expected.
/newListMethods.fir.kt:(853,861): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(870,875): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(896,903): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(912,916): error: Function invocation 'last()' expected.
/newListMethods.fir.kt:(1030,1038): error: Unresolved reference 'getFirst'.
/newListMethods.fir.kt:(1047,1052): error: Function invocation 'first()' expected.
/newListMethods.fir.kt:(1073,1080): error: Unresolved reference 'getLast'.
/newListMethods.fir.kt:(1089,1093): error: Function invocation 'last()' expected.