From 794819cea2071ca51b7339a18d7d92ae55415ae0 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 14 Nov 2015 17:48:29 +0300 Subject: [PATCH] StdLib cleanup: make calls non-infix --- .../stdlib/test/collections/ArraysTest.kt | 98 +++++++++---------- .../stdlib/test/collections/CollectionTest.kt | 10 +- .../test/collections/ListBinarySearchTest.kt | 6 +- libraries/stdlib/test/numbers/CoercionTest.kt | 2 +- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt index 508e53bd5ff..ac30edcbe21 100644 --- a/libraries/stdlib/test/collections/ArraysTest.kt +++ b/libraries/stdlib/test/collections/ArraysTest.kt @@ -238,44 +238,44 @@ class ArraysTest { } @test fun indexOfInPrimitiveArrays() { - expect(-1) { byteArrayOf(1, 2, 3) indexOf 0 } - expect(0) { byteArrayOf(1, 2, 3) indexOf 1 } - expect(1) { byteArrayOf(1, 2, 3) indexOf 2 } - expect(2) { byteArrayOf(1, 2, 3) indexOf 3 } + expect(-1) { byteArrayOf(1, 2, 3).indexOf(0) } + expect(0) { byteArrayOf(1, 2, 3).indexOf(1) } + expect(1) { byteArrayOf(1, 2, 3).indexOf(2) } + expect(2) { byteArrayOf(1, 2, 3).indexOf(3) } - expect(-1) { shortArrayOf(1, 2, 3) indexOf 0 } - expect(0) { shortArrayOf(1, 2, 3) indexOf 1 } - expect(1) { shortArrayOf(1, 2, 3) indexOf 2 } - expect(2) { shortArrayOf(1, 2, 3) indexOf 3 } + expect(-1) { shortArrayOf(1, 2, 3).indexOf(0) } + expect(0) { shortArrayOf(1, 2, 3).indexOf(1) } + expect(1) { shortArrayOf(1, 2, 3).indexOf(2) } + expect(2) { shortArrayOf(1, 2, 3).indexOf(3) } - expect(-1) { intArrayOf(1, 2, 3) indexOf 0 } - expect(0) { intArrayOf(1, 2, 3) indexOf 1 } - expect(1) { intArrayOf(1, 2, 3) indexOf 2 } - expect(2) { intArrayOf(1, 2, 3) indexOf 3 } + expect(-1) { intArrayOf(1, 2, 3).indexOf(0) } + expect(0) { intArrayOf(1, 2, 3).indexOf(1) } + expect(1) { intArrayOf(1, 2, 3).indexOf(2) } + expect(2) { intArrayOf(1, 2, 3).indexOf(3) } - expect(-1) { longArrayOf(1, 2, 3) indexOf 0 } - expect(0) { longArrayOf(1, 2, 3) indexOf 1 } - expect(1) { longArrayOf(1, 2, 3) indexOf 2 } - expect(2) { longArrayOf(1, 2, 3) indexOf 3 } + expect(-1) { longArrayOf(1, 2, 3).indexOf(0) } + expect(0) { longArrayOf(1, 2, 3).indexOf(1) } + expect(1) { longArrayOf(1, 2, 3).indexOf(2) } + expect(2) { longArrayOf(1, 2, 3).indexOf(3) } - expect(-1) { floatArrayOf(1.0f, 2.0f, 3.0f) indexOf 0f } - expect(0) { floatArrayOf(1.0f, 2.0f, 3.0f) indexOf 1.0f } - expect(1) { floatArrayOf(1.0f, 2.0f, 3.0f) indexOf 2.0f } - expect(2) { floatArrayOf(1.0f, 2.0f, 3.0f) indexOf 3.0f } + expect(-1) { floatArrayOf(1.0f, 2.0f, 3.0f).indexOf(0f) } + expect(0) { floatArrayOf(1.0f, 2.0f, 3.0f).indexOf(1.0f) } + expect(1) { floatArrayOf(1.0f, 2.0f, 3.0f).indexOf(2.0f) } + expect(2) { floatArrayOf(1.0f, 2.0f, 3.0f).indexOf(3.0f) } - expect(-1) { doubleArrayOf(1.0, 2.0, 3.0) indexOf 0.0 } - expect(0) { doubleArrayOf(1.0, 2.0, 3.0) indexOf 1.0 } - expect(1) { doubleArrayOf(1.0, 2.0, 3.0) indexOf 2.0 } - expect(2) { doubleArrayOf(1.0, 2.0, 3.0) indexOf 3.0 } + expect(-1) { doubleArrayOf(1.0, 2.0, 3.0).indexOf(0.0) } + expect(0) { doubleArrayOf(1.0, 2.0, 3.0).indexOf(1.0) } + expect(1) { doubleArrayOf(1.0, 2.0, 3.0).indexOf(2.0) } + expect(2) { doubleArrayOf(1.0, 2.0, 3.0).indexOf(3.0) } - expect(-1) { charArrayOf('a', 'b', 'c') indexOf 'z' } - expect(0) { charArrayOf('a', 'b', 'c') indexOf 'a' } - expect(1) { charArrayOf('a', 'b', 'c') indexOf 'b' } - expect(2) { charArrayOf('a', 'b', 'c') indexOf 'c' } + expect(-1) { charArrayOf('a', 'b', 'c').indexOf('z') } + expect(0) { charArrayOf('a', 'b', 'c').indexOf('a') } + expect(1) { charArrayOf('a', 'b', 'c').indexOf('b') } + expect(2) { charArrayOf('a', 'b', 'c').indexOf('c') } - expect(0) { booleanArrayOf(true, false) indexOf true } - expect(1) { booleanArrayOf(true, false) indexOf false } - expect(-1) { booleanArrayOf(true) indexOf false } + expect(0) { booleanArrayOf(true, false).indexOf(true) } + expect(1) { booleanArrayOf(true, false).indexOf(false) } + expect(-1) { booleanArrayOf(true).indexOf(false) } } @test fun indexOf() { @@ -516,15 +516,15 @@ class ArraysTest { @test fun reduce() { - expect(-4) { intArrayOf(1, 2, 3) reduce { a, b -> a - b } } - expect(-4.toLong()) { longArrayOf(1, 2, 3) reduce { a, b -> a - b } } - expect(-4F) { floatArrayOf(1F, 2F, 3F) reduce { a, b -> a - b } } - expect(-4.0) { doubleArrayOf(1.0, 2.0, 3.0) reduce { a, b -> a - b } } - expect('3') { charArrayOf('1', '3', '2') reduce { a, b -> if (a > b) a else b } } - expect(false) { booleanArrayOf(true, true, false) reduce { a, b -> a && b } } - expect(true) { booleanArrayOf(true, true) reduce { a, b -> a && b } } - expect(0.toByte()) { byteArrayOf(3, 2, 1) reduce { a, b -> (a - b).toByte() } } - expect(0.toShort()) { shortArrayOf(3, 2, 1) reduce { a, b -> (a - b).toShort() } } + expect(-4) { intArrayOf(1, 2, 3).reduce { a, b -> a - b } } + expect(-4.toLong()) { longArrayOf(1, 2, 3).reduce { a, b -> a - b } } + expect(-4F) { floatArrayOf(1F, 2F, 3F).reduce { a, b -> a - b } } + expect(-4.0) { doubleArrayOf(1.0, 2.0, 3.0).reduce { a, b -> a - b } } + expect('3') { charArrayOf('1', '3', '2').reduce { a, b -> if (a > b) a else b } } + expect(false) { booleanArrayOf(true, true, false).reduce { a, b -> a && b } } + expect(true) { booleanArrayOf(true, true).reduce { a, b -> a && b } } + expect(0.toByte()) { byteArrayOf(3, 2, 1).reduce { a, b -> (a - b).toByte() } } + expect(0.toShort()) { shortArrayOf(3, 2, 1).reduce { a, b -> (a - b).toShort() } } assertTrue(assertFails { intArrayOf().reduce { a, b -> a + b } @@ -532,15 +532,15 @@ class ArraysTest { } @test fun reduceRight() { - expect(2) { intArrayOf(1, 2, 3) reduceRight { a, b -> a - b } } - expect(2.toLong()) { longArrayOf(1, 2, 3) reduceRight { a, b -> a - b } } - expect(2F) { floatArrayOf(1F, 2F, 3F) reduceRight { a, b -> a - b } } - expect(2.0) { doubleArrayOf(1.0, 2.0, 3.0) reduceRight { a, b -> a - b } } - expect('3') { charArrayOf('1', '3', '2') reduceRight { a, b -> if (a > b) a else b } } - expect(false) { booleanArrayOf(true, true, false) reduceRight { a, b -> a && b } } - expect(true) { booleanArrayOf(true, true) reduceRight { a, b -> a && b } } - expect(2.toByte()) { byteArrayOf(1, 2, 3) reduceRight { a, b -> (a - b).toByte() } } - expect(2.toShort()) { shortArrayOf(1, 2, 3) reduceRight { a, b -> (a - b).toShort() } } + expect(2) { intArrayOf(1, 2, 3).reduceRight { a, b -> a - b } } + expect(2.toLong()) { longArrayOf(1, 2, 3).reduceRight { a, b -> a - b } } + expect(2F) { floatArrayOf(1F, 2F, 3F).reduceRight { a, b -> a - b } } + expect(2.0) { doubleArrayOf(1.0, 2.0, 3.0).reduceRight { a, b -> a - b } } + expect('3') { charArrayOf('1', '3', '2').reduceRight { a, b -> if (a > b) a else b } } + expect(false) { booleanArrayOf(true, true, false).reduceRight { a, b -> a && b } } + expect(true) { booleanArrayOf(true, true).reduceRight { a, b -> a && b } } + expect(2.toByte()) { byteArrayOf(1, 2, 3).reduceRight { a, b -> (a - b).toByte() } } + expect(2.toShort()) { shortArrayOf(1, 2, 3).reduceRight { a, b -> (a - b).toShort() } } assertTrue(assertFails { intArrayOf().reduceRight { a, b -> a + b } diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index 3084c67392b..cd280bfc48c 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -207,7 +207,7 @@ class CollectionTest { } @test fun mapRanges() { - val range = 1..3 map { it * 2 } + val range = (1..3).map { it * 2 } assertEquals(listOf(2, 4, 6), range) } @@ -553,14 +553,14 @@ class CollectionTest { } @test fun takeReturnsFirstNElements() { - expect(listOf(1, 2, 3, 4, 5)) { (1..10) take 5 } + expect(listOf(1, 2, 3, 4, 5)) { (1..10).take(5) } expect(listOf(1, 2, 3, 4, 5)) { (1..10).toList().take(5) } - expect(listOf(1, 2)) { (1..10) take 2 } + expect(listOf(1, 2)) { (1..10).take(2) } expect(listOf(1, 2)) { (1..10).toList().take(2) } expect(true) { (0L..5L).take(0).none() } expect(true) { listOf(1L).take(0).none() } - expect(listOf(1)) { (1..1) take 10 } - expect(listOf(1)) { listOf(1) take 10 } + expect(listOf(1)) { (1..1).take(10) } + expect(listOf(1)) { listOf(1).take(10) } } @test fun sortInPlace() { diff --git a/libraries/stdlib/test/collections/ListBinarySearchTest.kt b/libraries/stdlib/test/collections/ListBinarySearchTest.kt index 524aee58527..2700c07db7d 100644 --- a/libraries/stdlib/test/collections/ListBinarySearchTest.kt +++ b/libraries/stdlib/test/collections/ListBinarySearchTest.kt @@ -41,7 +41,7 @@ class ListBinarySearchTest { @Test fun binarySearchWithComparator() { - val list = values map { IncomparableDataItem(it) } + val list = values.map { IncomparableDataItem(it) } list.forEachIndexed { index, item -> assertEquals(index, list.binarySearch(item, comparator)) @@ -57,7 +57,7 @@ class ListBinarySearchTest { @Test fun binarySearchByKey() { - val list = values map { IncomparableDataItem(it) } + val list = values.map { IncomparableDataItem(it) } list.forEachIndexed { index, item -> assertEquals(index, list.binarySearchBy(item.value) { it.value }) @@ -74,7 +74,7 @@ class ListBinarySearchTest { @Test fun binarySearchByKeyWithComparator() { - val list = values map { IncomparableDataItem(IncomparableDataItem(it)) } + val list = values.map { IncomparableDataItem(IncomparableDataItem(it)) } list.forEachIndexed { index, item -> assertEquals(index, list.binarySearch { comparator.compare(it.value, item.value) } ) diff --git a/libraries/stdlib/test/numbers/CoercionTest.kt b/libraries/stdlib/test/numbers/CoercionTest.kt index ad777d8018b..71c9c7cef28 100644 --- a/libraries/stdlib/test/numbers/CoercionTest.kt +++ b/libraries/stdlib/test/numbers/CoercionTest.kt @@ -91,7 +91,7 @@ class CoercionTest { @Test @Suppress("DEPRECATION_ERROR") fun coercionsComparable() { - val v = 0..10 map { ComparableNumber(it) } + val v = (0..10).map { ComparableNumber(it) } expect(5) { v[5].coerceAtLeast(v[1]).value } expect(5) { v[1].coerceAtLeast(v[5]).value }