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

stdlib tests: provide expect/actual helper functions

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-01-25 17:39:37 +03:00
parent ee9608f8db
commit ba873e2b46
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/js/StubsJVM.kt
+4 -4
View File
@@ -17,7 +17,7 @@
@file:JvmVersion
package test.collections.js
public fun <V> stringMapOf(vararg pairs: Pair<String, V>): HashMap<String, V> = hashMapOf<String, V>(*pairs)
public fun <V> linkedStringMapOf(vararg pairs: Pair<String, V>): LinkedHashMap<String, V> = linkedMapOf(*pairs)
public fun stringSetOf(vararg elements: String): HashSet<String> = hashSetOf(*elements)
public fun linkedStringSetOf(vararg elements: String): LinkedHashSet<String> = linkedSetOf(*elements)
public actual fun <V> stringMapOf(vararg pairs: Pair<String, V>): HashMap<String, V> = hashMapOf<String, V>(*pairs)
public actual fun <V> linkedStringMapOf(vararg pairs: Pair<String, V>): LinkedHashMap<String, V> = linkedMapOf(*pairs)
public actual fun stringSetOf(vararg elements: String): HashSet<String> = hashSetOf(*elements)
public actual fun linkedStringSetOf(vararg elements: String): LinkedHashSet<String> = linkedSetOf(*elements)
libraries/stdlib/test/testUtilsJVM.kt
+5 -5
View File
@@ -19,19 +19,19 @@ package test
import kotlin.test.assertEquals
@JvmVersion
public fun assertTypeEquals(expected: Any?, actual: Any?) {
public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
assertEquals(expected?.javaClass, actual?.javaClass)
}
@JvmVersion
public fun randomInt(limit: Int): Int = (Math.random() * limit).toInt()
public actual fun randomInt(limit: Int): Int = (Math.random() * limit).toInt()
@kotlin.jvm.JvmVersion
private val isJava6 = System.getProperty("java.version").startsWith("1.6.")
@kotlin.jvm.JvmVersion
internal fun String.removeLeadingPlusOnJava6(): String =
if (isJava6) removePrefix("+") else this
internal actual fun String.removeLeadingPlusOnJava6(): String =
if (isJava6) removePrefix("+") else this
@kotlin.jvm.JvmVersion
internal fun doubleTotalOrderEquals(a: Any?, b: Any?) = a == b
internal actual fun doubleTotalOrderEquals(a: Double?, b: Double?) = (a as Any?) == b