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

Update stdlib usages of PropertyMetadata to KProperty<*>

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-14 20:06:37 +03:00
parent 43bb9347c6
commit 556a169a5d
10 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
+11 -11
View File
@@ -3,6 +3,7 @@ package test.properties.delegation.map
import org.junit.Test as test
import java.util.HashMap
import kotlin.properties.*
import kotlin.reflect.KProperty
import kotlin.test.*
data class B(val a: Int)
@@ -125,15 +126,14 @@ class MapPropertyFunctionTest() {
}
}
// TODO Remove explicit types when KT-9072 will be fixed
val mapVal: MapVal<MapPropertyCustomTest, String, String> = object: MapVal<MapPropertyCustomTest, String, String>() {
val mapVal = object : MapVal<MapPropertyCustomTest, String, String>() {
override fun map(ref: MapPropertyCustomTest) = ref.map
override fun key(desc: PropertyMetadata) = "${desc.name}Desc"
override fun key(property: KProperty<*>) = "${property.name}Desc"
}
val mapVar: MapVar<MapPropertyCustomTest, String, String> = object : MapVar<MapPropertyCustomTest, String, String>() {
val mapVar = object : MapVar<MapPropertyCustomTest, String, String>() {
override fun map(ref: MapPropertyCustomTest) = ref.map
override fun key(desc: PropertyMetadata) = "${desc.name}Desc"
override fun key(property: KProperty<*>) = "${property.name}Desc"
}
class MapPropertyCustomTest() {
@@ -148,18 +148,18 @@ class MapPropertyCustomTest() {
}
}
val mapValWithDefault: MapVal<MapPropertyCustomWithDefaultTest, String, String> = object : MapVal<MapPropertyCustomWithDefaultTest, String, String>() {
val mapValWithDefault = object : MapVal<MapPropertyCustomWithDefaultTest, String, String>() {
override fun map(ref: MapPropertyCustomWithDefaultTest) = ref.map
override fun key(desc: PropertyMetadata) = desc.name
override fun key(property: KProperty<*>) = property.name
override fun default(ref: MapPropertyCustomWithDefaultTest, key: PropertyMetadata) = "default"
override fun default(ref: MapPropertyCustomWithDefaultTest, key: KProperty<*>) = "default"
}
val mapVarWithDefault: MapVar<MapPropertyCustomWithDefaultTest, String, String> = object : MapVar<MapPropertyCustomWithDefaultTest, String, String>() {
val mapVarWithDefault = object : MapVar<MapPropertyCustomWithDefaultTest, String, String>() {
override fun map(ref: MapPropertyCustomWithDefaultTest) = ref.map
override fun key(desc: PropertyMetadata) = desc.name
override fun key(property: KProperty<*>) = property.name
override fun default(ref: MapPropertyCustomWithDefaultTest, key: PropertyMetadata) = "default"
override fun default(ref: MapPropertyCustomWithDefaultTest, key: KProperty<*>) = "default"
}
class MapPropertyCustomWithDefaultTest() {