Migrate type parameter list syntax.

This commit is contained in:
Ilya Gorbunov
2015-11-17 22:54:22 +03:00
parent 16c5289e6c
commit c3190bbae3
7 changed files with 21 additions and 21 deletions
@@ -183,7 +183,7 @@ class CollectionJVMTest {
assertTrue(value === result)
}
private fun serializeAndDeserialize<T>(value: T): T {
private fun <T> serializeAndDeserialize(value: T): T {
val outputStream = ByteArrayOutputStream()
val objectOutputStream = ObjectOutputStream(outputStream)
@@ -2,7 +2,7 @@ package test.collections
import kotlin.test.*
public fun compare<T>(expected: T, actual: T, block:CompareContext<T>.() -> Unit) {
public fun <T> compare(expected: T, actual: T, block:CompareContext<T>.() -> Unit) {
CompareContext(expected, actual).block()
}
@@ -11,11 +11,11 @@ public class CompareContext<out T>(public val expected: T, public val actual: T)
public fun equals(message: String = "") {
assertEquals(expected, actual, message)
}
public fun propertyEquals<P>(message: String = "", getter: T.() -> P) {
public fun <P> propertyEquals(message: String = "", getter: T.() -> P) {
assertEquals(expected.getter(), actual.getter(), message)
}
public fun propertyFails(getter: T.() -> Unit) { assertFailEquals({expected.getter()}, {actual.getter()}) }
public fun compareProperty<P>(getter: T.() -> P, block: CompareContext<P>.() -> Unit) {
public fun <P> compareProperty(getter: T.() -> P, block: CompareContext<P>.() -> Unit) {
compare(expected.getter(), actual.getter(), block)
}
+2 -2
View File
@@ -8,7 +8,7 @@ import org.junit.Test as test
class ComplexMapJsTest : MapJsTest() {
// Helper function with generic parameter to force to use ComlpexHashMap
fun doTest<K : kotlin.Comparable<K>>() {
fun <K : kotlin.Comparable<K>> doTest() {
HashMap<K, Int>()
HashMap<K, Int>(3)
HashMap<K, Int>(3, 0.5f)
@@ -488,5 +488,5 @@ abstract class MapJsTest {
return map
}
fun genericHashMapOf<K, V>(vararg values: Pair<K, V>) = hashMapOf(*values)
fun <K, V> genericHashMapOf(vararg values: Pair<K, V>) = hashMapOf(*values)
}
+2 -2
View File
@@ -8,7 +8,7 @@ import java.util.LinkedHashSet
class ComplexSetJsTest : SetJsTest() {
// Helper function with generic parameter to force to use ComlpexHashMap
fun doTest<T>() {
fun <T> doTest() {
HashSet<T>()
HashSet<T>(3)
HashSet<T>(3, 0.5f)
@@ -257,5 +257,5 @@ abstract class SetJsTest {
return set
}
fun genericHashSetOf<T>(vararg values: T) = hashSetOf(*values)
fun <T> genericHashSetOf(vararg values: T) = hashSetOf(*values)
}
+1 -1
View File
@@ -86,7 +86,7 @@ class LazyJVMTest {
}
private fun serializeAndDeserialize<T>(value: T): T {
private fun <T> serializeAndDeserialize(value: T): T {
val outputStream = ByteArrayOutputStream()
val objectOutputStream = ObjectOutputStream(outputStream)