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

Update test data. Use simple ''@JvmDefault' instead full qualifier

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-03-09 11:46:00 +01:00
parent 2a8041e77e
commit 38f8924ae3
61 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
Vendored
+3 -3
View File
@@ -6,19 +6,19 @@ var storage = "fail"
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
private var foo: String
get() = storage
set(value) {
storage = value
}
@kotlin.annotations.JvmDefault
@JvmDefault
private fun bar(): String {
return "K"
}
@kotlin.annotations.JvmDefault
@JvmDefault
fun call(): String {
return {
foo = "O"
compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
private val foo: String
get() = "O"
@kotlin.annotations.JvmDefault
@JvmDefault
private fun bar(): String {
return "K"
}
compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
private val foo: String
get() = "O"
@kotlin.annotations.JvmDefault
@JvmDefault
private fun bar(): String {
return "K"
}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(p: T): T {
return p
}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME
interface Test<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(p: T): T {
return p
}
}
interface Test2: Test<String> {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(p: String): String {
return p + "K"
}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK
interface Test<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(p: T): T {
return null!!
}
@@ -15,7 +15,7 @@ interface Test<T> {
}
interface Test2: Test<String> {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(p: String): String {
return p
}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
var test: T
get() = null!!
set(value) {
@@ -13,7 +13,7 @@ interface Test<T> {
var result = "fail"
interface Test2 : Test<String> {
@kotlin.annotations.JvmDefault
@JvmDefault
override var test: String
get() = result
set(value) {
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK
interface Test<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
var T.test: T
get() = null!!
set(value) {
@@ -19,7 +19,7 @@ interface Test<T> {
}
interface Test2 : Test<String> {
@kotlin.annotations.JvmDefault
@JvmDefault
override var String.test: String
get() = ""
set(value) {}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public interface Test<T> {
// FILE: kotlin.kt
interface Test2: Test<String> {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(p: String): String {
return p
}
compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun foo(): String = "O"
@kotlin.annotations.JvmDefault
@JvmDefault
val bar: String
get() = "K"
compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface IBase {
@kotlin.annotations.JvmDefault
@JvmDefault
fun bar() = "OK"
}
compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Z {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(s: String = "OK"): String {
return s
}
compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "O"
}
compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
val test: String
get() = "O"
compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "Test"
}
@@ -16,7 +16,7 @@ open class TestClass : Test {
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return "Test2"
}
compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return inlineFun { "O" }
}
@@ -12,7 +12,7 @@ interface Test {
return inlineFun { "K" }
}
@kotlin.annotations.JvmDefault
@JvmDefault
private inline fun inlineFun(s: () -> String) = s()
}
compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return inlineProp
}
@@ -12,7 +12,7 @@ interface Test {
return inlineProp
}
@kotlin.annotations.JvmDefault
@JvmDefault
private inline val inlineProp: String
get() = "OK"
compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
Vendored
+5 -5
View File
@@ -5,19 +5,19 @@
interface Z {
@kotlin.annotations.JvmDefault
@JvmDefault
private fun privateFun() = { "OK" }
@kotlin.annotations.JvmDefault
@JvmDefault
fun callPrivateFun() = privateFun()
@kotlin.annotations.JvmDefault
@JvmDefault
fun publicFun() = { "OK" }
@kotlin.annotations.JvmDefault
@JvmDefault
fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit
@kotlin.annotations.JvmDefault
@JvmDefault
val property: () -> Unit
get() = {}
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Z<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(p: T): T {
return p
}
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Z<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(p: T): T {
return p
}
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ interface Z<T> {
val value: T
@kotlin.annotations.JvmDefault
@JvmDefault
val z: T
get() = value
}
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
// FULL_JDK
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {
}
}
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
// FULL_JDK
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {
}
}
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
// FULL_JDK
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {
}
}
compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
Vendored
+2 -2
View File
@@ -3,12 +3,12 @@
// WITH_RUNTIME
interface KCallable {
@kotlin.annotations.JvmDefault
@JvmDefault
val returnType: String
}
interface KCallableImpl : KCallable {
@kotlin.annotations.JvmDefault
@JvmDefault
override val returnType: String
get() = "OK"
}
compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
Vendored
+2 -2
View File
@@ -3,12 +3,12 @@
// WITH_RUNTIME
interface KCallable {
@kotlin.annotations.JvmDefault
@JvmDefault
val returnType: String
}
interface KCallableImpl : KCallable {
@kotlin.annotations.JvmDefault
@JvmDefault
override val returnType: String
get() = "OK"
}
compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
Vendored
+2 -2
View File
@@ -7,12 +7,12 @@ interface Test {
return privateFun() + privateProp
}
@kotlin.annotations.JvmDefault
@JvmDefault
private fun privateFun(): String {
return "O"
}
@kotlin.annotations.JvmDefault
@JvmDefault
private val privateProp: String
get() = "K"
}
compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return privateFun() + privateProp
}
compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ annotation class Accessor(val value: String)
interface Z {
@Property("OK")
@kotlin.annotations.JvmDefault
@JvmDefault
val z: String
@Accessor("OK")
get() = "OK"
compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "OK"
}
compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Z {
@kotlin.annotations.JvmDefault
@JvmDefault
val z: String
get() = "OK"
}
compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "OK"
}
}
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ class B : A<String, String>, java.util.AbstractMap<String, String>() {
}
interface C<K, V> : MutableMap<K, V> {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun remove(key: K, value: V) = true
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "OK"
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "OK"
}
@@ -12,7 +12,7 @@ interface Test {
// FILE: 2.kt
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
val prop: String
get() = "OK"
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME
// FILE: 1.kt
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
val prop: String
get() = "OK"
}
// FILE: 2.kt
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override val prop: String
get() = super.prop
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
@@ -22,7 +22,7 @@ interface Test3 : Test {
interface Test4 : Test2, Test3 {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ open class TestClass : Test {
}
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ abstract class TestClass : Test {
}
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return "OK"
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ interface Test {
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override fun test(): String {
return super.test()
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Test2 : Test {
@kotlin.annotations.JvmDefault
@JvmDefault
override val test: String
get() = super.test
}
compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test(): String {
return "OK"
}
compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME
interface Test {
@kotlin.annotations.JvmDefault
@JvmDefault
var z: String
get() = "OK"
set(value) {}