JvmDefault: remove most tests on @JvmDefault
The tests are removed because JvmDefault is going to be deprecated with error in KT-54746 and removed later in KT-57696. Many of the removed tests already had existing counterparts with the new modes `all` and `all-compatibility`. In this change, I've added such tests where they were missing, and removed tests which were testing behavior specific to the JvmDefault annotation, such as some diagnostics. #KT-54746
This commit is contained in:
committed by
Space Team
parent
ace2279631
commit
3120a35a88
Vendored
+2
-3
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
interface Test {
|
||||
fun test(): String {
|
||||
@@ -8,11 +8,11 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override fun test(): String {
|
||||
return super.test()
|
||||
}
|
||||
@@ -24,7 +24,6 @@ interface Test3 : Test {
|
||||
|
||||
|
||||
interface Test4 : Test2, Test3 {
|
||||
@JvmDefault
|
||||
override fun test(): String {
|
||||
return super.test()
|
||||
}
|
||||
|
||||
Vendored
+2
-2
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
interface Test {
|
||||
fun test(): String {
|
||||
@@ -8,6 +8,7 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
@@ -18,7 +19,6 @@ open class TestClass : Test {
|
||||
}
|
||||
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override fun test(): String
|
||||
}
|
||||
|
||||
|
||||
Vendored
+2
-2
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
interface Test {
|
||||
fun test(): String {
|
||||
@@ -8,6 +8,7 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
@@ -16,7 +17,6 @@ abstract class TestClass : Test {
|
||||
}
|
||||
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override fun test(): String {
|
||||
return "OK"
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
interface Test {
|
||||
fun test(): String {
|
||||
@@ -8,11 +8,11 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override fun test(): String {
|
||||
return super.test()
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
|
||||
interface Test {
|
||||
@@ -9,11 +9,11 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override fun test(): String {
|
||||
return super.test()
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// MODULE: lib
|
||||
// !JVM_DEFAULT_MODE: disable
|
||||
// FILE: 1.kt
|
||||
|
||||
interface Test {
|
||||
@@ -8,11 +8,11 @@ interface Test {
|
||||
}
|
||||
|
||||
// MODULE: main(lib)
|
||||
// !JVM_DEFAULT_MODE: all
|
||||
// JVM_TARGET: 1.8
|
||||
// WITH_STDLIB
|
||||
// FILE: 2.kt
|
||||
interface Test2 : Test {
|
||||
@JvmDefault
|
||||
override val test: String
|
||||
get() = super.test
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user