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:
Alexander Udalov
committed by
Space Team
Space Team
parent
ace2279631
commit
3120a35a88
Vendored
-50
@@ -1,50 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault fun foo() = "O"
|
||||
@JvmDefault fun bar() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1(val k: String): IFooBar {
|
||||
override fun bar(): String = k
|
||||
}
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2(val k: String): IFooBar2 {
|
||||
override fun bar(): String = k
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo() + k.bar()
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo() + ik.bar()
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo() + k2.bar()
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo() + ik2.bar()
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo() + ik3.bar()
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
Vendored
-50
@@ -1,50 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault fun foo() = "O"
|
||||
@JvmDefault fun bar() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1<T: String>(val k: T): IFooBar {
|
||||
override fun bar(): String = k
|
||||
}
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2<T: String>(val k: T): IFooBar2 {
|
||||
override fun bar(): String = k
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo() + k.bar()
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo() + ik.bar()
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo() + k2.bar()
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo() + ik2.bar()
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo() + ik3.bar()
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault val foo get() = "O"
|
||||
@JvmDefault val bar get() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1(override val bar: String): IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2(override val bar: String): IFooBar2
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo + k.bar
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo + ik.bar
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo + k2.bar
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo + ik2.bar
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo + ik3.bar
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault val foo get() = "O"
|
||||
@JvmDefault val bar get() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1<T: String>(override val bar: T): IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2<T: String>(override val bar: T): IFooBar2
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo + k.bar
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo + ik.bar
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo + k2.bar
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo + ik2.bar
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo + ik3.bar
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
Vendored
-52
@@ -1,52 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault val foo get() = "O"
|
||||
@JvmDefault val bar get() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1(val k: String): IFooBar {
|
||||
override val bar: String
|
||||
get() = k
|
||||
}
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2(val k: String): IFooBar2 {
|
||||
override val bar: String
|
||||
get() = k
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo + k.bar
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo + ik.bar
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo + k2.bar
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo + ik2.bar
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo + ik3.bar
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
// !JVM_DEFAULT_MODE: enable
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// JVM_TARGET: 1.8
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
|
||||
|
||||
// FILE: jvmDefaultEnable.kt
|
||||
|
||||
interface IFooBar {
|
||||
@JvmDefault val foo get() = "O"
|
||||
@JvmDefault val bar get() = "Failed"
|
||||
}
|
||||
|
||||
interface IFooBar2 : IFooBar
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test1<T: String>(val k: T): IFooBar {
|
||||
override val bar: String
|
||||
get() = k
|
||||
}
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Test2<T: String>(val k: T): IFooBar2 {
|
||||
override val bar: String
|
||||
get() = k
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val k = Test1("K")
|
||||
val ik: IFooBar = k
|
||||
val k2 = Test2("K")
|
||||
val ik2: IFooBar = k2
|
||||
val ik3: IFooBar2 = k2
|
||||
|
||||
val test1 = k.foo + k.bar
|
||||
if (test1 != "OK") throw AssertionError("test1: $test1")
|
||||
|
||||
val test2 = ik.foo + ik.bar
|
||||
if (test2 != "OK") throw AssertionError("test2: $test2")
|
||||
|
||||
val test3 = k2.foo + k2.bar
|
||||
if (test3 != "OK") throw AssertionError("test3: $test3")
|
||||
|
||||
val test4 = ik2.foo + ik2.bar
|
||||
if (test4 != "OK") throw AssertionError("test4: $test4")
|
||||
|
||||
val test5 = ik3.foo + ik3.bar
|
||||
if (test5 != "OK") throw AssertionError("test5: $test5")
|
||||
|
||||
return "OK"
|
||||
}
|
||||
Reference in New Issue
Block a user