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

Reformat stdlib tests and samples

Browse Source 
#KT-5558
This commit is contained in:
Ilya Gorbunov
2018-04-23 16:18:24 +03:00
parent add09e0f2e
commit ecf0d7ec0d
39 changed files with 389 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/numbers/MathTest.kt
+3 -4
View File
@@ -133,7 +133,7 @@ class DoubleMathTest {
assertEquals(0.25, 2.0.pow(-2))
assertTrue(0.0.pow(Double.NaN).isNaN())
assertTrue(Double.NaN.pow(-1).isNaN())
assertTrue((-7.0).pow(1/3.0).isNaN())
assertTrue((-7.0).pow(1 / 3.0).isNaN())
assertTrue(1.0.pow(Double.POSITIVE_INFINITY).isNaN())
assertTrue((-1.0).pow(Double.NEGATIVE_INFINITY).isNaN())
@@ -322,8 +322,7 @@ class DoubleMathTest {
val prev = value.nextDown()
if (prev > 0) {
assertEquals(value, prev + prev.ulp)
}
else {
} else {
assertEquals(prev, value - value.ulp)
}
@@ -472,7 +471,7 @@ class FloatMathTest {
assertEquals(0.25F, 2.0F.pow(-2))
assertTrue(0.0F.pow(Float.NaN).isNaN())
assertTrue(Float.NaN.pow(-1).isNaN())
assertTrue((-7.0F).pow(1/3.0F).isNaN())
assertTrue((-7.0F).pow(1 / 3.0F).isNaN())
assertTrue(1.0F.pow(Float.POSITIVE_INFINITY).isNaN())
assertTrue((-1.0F).pow(Float.NEGATIVE_INFINITY).isNaN())
libraries/stdlib/test/numbers/NaNPropagationTest.kt
+93 -51
View File
@@ -13,9 +13,11 @@ val Float.Companion.values get() = listOf(0.0f, NEGATIVE_INFINITY, MIN_VALUE, MA
class NaNPropagationTest {
private fun propagateOf2(f2d: (Double, Double) -> Double,
f2f: (Float, Float) -> Float,
function: String) {
private fun propagateOf2(
f2d: (Double, Double) -> Double,
f2f: (Float, Float) -> Float,
function: String
) {
with(Double) {
for (d in values) {
assertTrue(f2d(d, NaN).isNaN(), "$function($d, NaN)")
@@ -30,8 +32,10 @@ class NaNPropagationTest {
}
}
private fun propagateOf3(f3d: (Double, Double, Double) -> Double,
f3f: (Float, Float, Float) -> Float, function: String) {
private fun propagateOf3(
f3d: (Double, Double, Double) -> Double,
f3f: (Float, Float, Float) -> Float, function: String
) {
with(Double) {
for (d in values) {
@@ -49,62 +53,88 @@ class NaNPropagationTest {
}
}
@Test fun minOf() {
@Test
fun minOf() {
propagateOf2(::minOf, ::minOf, "minOf")
propagateOf3(::minOf, ::minOf, "minOf")
}
@Test fun maxOf() {
@Test
fun maxOf() {
propagateOf2(::maxOf, ::maxOf, "maxOf")
propagateOf3(::maxOf, ::maxOf, "maxOf")
}
@Test fun arrayMin() {
propagateOf2({ a, b -> arrayOf(a, b).min()!! },
{ a, b -> arrayOf(a, b).min()!! },
"arrayOf().min()")
@Test
fun arrayMin() {
propagateOf2(
{ a, b -> arrayOf(a, b).min()!! },
{ a, b -> arrayOf(a, b).min()!! },
"arrayOf().min()"
)
}
@Test fun arrayMax() {
propagateOf2({ a, b -> arrayOf(a, b).max()!! },
{ a, b -> arrayOf(a, b).max()!! },
"arrayOf().max()")
@Test
fun arrayMax() {
propagateOf2(
{ a, b -> arrayOf(a, b).max()!! },
{ a, b -> arrayOf(a, b).max()!! },
"arrayOf().max()"
)
}
@Test fun primitiveArrayMin() {
propagateOf2({ a, b -> doubleArrayOf(a, b).min()!! },
{ a, b -> floatArrayOf(a, b).min()!! },
"primitiveArrayOf().min()")
@Test
fun primitiveArrayMin() {
propagateOf2(
{ a, b -> doubleArrayOf(a, b).min()!! },
{ a, b -> floatArrayOf(a, b).min()!! },
"primitiveArrayOf().min()"
)
}
@Test fun primitiveArrayMax() {
propagateOf2({ a, b -> doubleArrayOf(a, b).max()!! },
{ a, b -> floatArrayOf(a, b).max()!! },
"primitiveArrayOf().max()")
@Test
fun primitiveArrayMax() {
propagateOf2(
{ a, b -> doubleArrayOf(a, b).max()!! },
{ a, b -> floatArrayOf(a, b).max()!! },
"primitiveArrayOf().max()"
)
}
@Test fun listMin() {
propagateOf2({ a, b -> listOf(a, b).min()!! },
{ a, b -> listOf(a, b).min()!! },
"listOf().min()")
@Test
fun listMin() {
propagateOf2(
{ a, b -> listOf(a, b).min()!! },
{ a, b -> listOf(a, b).min()!! },
"listOf().min()"
)
}
@Test fun listMax() {
propagateOf2({ a, b -> listOf(a, b).max()!! },
{ a, b -> listOf(a, b).max()!! },
"listOf().max()")
@Test
fun listMax() {
propagateOf2(
{ a, b -> listOf(a, b).max()!! },
{ a, b -> listOf(a, b).max()!! },
"listOf().max()"
)
}
@Test fun sequenceMin() {
propagateOf2({ a, b -> sequenceOf(a, b).min()!! },
{ a, b -> sequenceOf(a, b).min()!! },
"sequenceOf().min()")
@Test
fun sequenceMin() {
propagateOf2(
{ a, b -> sequenceOf(a, b).min()!! },
{ a, b -> sequenceOf(a, b).min()!! },
"sequenceOf().min()"
)
}
@Test fun sequenceMax() {
propagateOf2({ a, b -> sequenceOf(a, b).max()!! },
{ a, b -> sequenceOf(a, b).max()!! },
"sequenceOf().max()")
@Test
fun sequenceMax() {
propagateOf2(
{ a, b -> sequenceOf(a, b).max()!! },
{ a, b -> sequenceOf(a, b).max()!! },
"sequenceOf().max()"
)
}
}
@@ -113,7 +143,7 @@ class NaNTotalOrderTest {
private fun <T : Comparable<T>> totalOrderMinOf2(f2t: (T, T) -> T, function: String) {
@Suppress("UNCHECKED_CAST")
with (Double) {
with(Double) {
assertEquals<Any>(0.0, f2t(0.0 as T, NaN as T), "$function(0, NaN)")
assertEquals<Any>(0.0, f2t(NaN as T, 0.0 as T), "$function(NaN, 0)")
}
@@ -121,39 +151,51 @@ class NaNTotalOrderTest {
private fun <T : Comparable<T>> totalOrderMaxOf2(f2t: (T, T) -> T, function: String) {
@Suppress("UNCHECKED_CAST")
with (Double) {
with(Double) {
assertTrue((f2t(0.0 as T, NaN as T) as Double).isNaN(), "$function(0, NaN)")
assertTrue((f2t(NaN as T, 0.0 as T) as Double).isNaN(), "$function(NaN, 0)")
}
}
@Test fun minOfT() {
@Test
fun minOfT() {
totalOrderMinOf2<Comparable<Any>>(::minOf, "minOf")
}
@Test fun maxOfT() {
@Test
fun maxOfT() {
totalOrderMaxOf2<Comparable<Any>>(::maxOf, "maxOf")
}
@Test fun arrayTMin() {
@Test
fun arrayTMin() {
totalOrderMinOf2<Comparable<Any>>({ a, b -> arrayOf(a, b).min()!! }, "arrayOf().min()")
}
@Test fun arrayTMax() {
@Test
fun arrayTMax() {
totalOrderMaxOf2<Comparable<Any>>({ a, b -> arrayOf(a, b).max()!! }, "arrayOf().max()")
}
@Test fun listTMin() {
@Test
fun listTMin() {
totalOrderMinOf2<Comparable<Any>>({ a, b -> listOf(a, b).min()!! }, "listOf().min()")
}
@Test fun listTMax() {
@Test
fun listTMax() {
totalOrderMaxOf2<Comparable<Any>>({ a, b -> listOf(a, b).max()!! }, "listOf().max()")
}
@Test fun sequenceTMin() {
@Test
fun sequenceTMin() {
totalOrderMinOf2<Comparable<Any>>({ a, b -> sequenceOf(a, b).min()!! }, "sequenceOf().min()")
}
@Test fun sequenceTMax() {
@Test
fun sequenceTMax() {
totalOrderMaxOf2<Comparable<Any>>({ a, b -> sequenceOf(a, b).max()!! }, "sequenceOf().max()")
}
}