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

Change null handling in compareValuesBy(a, b, functions). Provide nullsFirst() and nullsLast() to extend Comparator<T> to Comparator<T?>.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-28 18:36:38 +03:00
parent 63110dcdf8
commit d49a1973e5
4 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/OrderingTest.kt
+14 -5
View File
@@ -34,12 +34,21 @@ class OrderingTest {
assertTrue(diff == 0)
}
Test fun compareNullables() {
val v1: Item? = this.v1
val v2: Item? = null
val diff = compareValuesBy(v1, v2) { it?.rating }
assertTrue(diff > 0)
val diff2 = compareBy<Item> { it.rating }.thenBy { it.name }.nullsLast().compare(v1, v2)
assertTrue(diff2 < 0)
}
Test fun sortComparatorThenComparator() {
val comparator = comparator<Item> { a, b -> a.name.compareTo(b.name) } thenComparator { a, b -> a.rating.compareTo(b.rating) }
val diff = comparator.compare(v1, v2)
assertTrue(diff > 0)
val items = arrayListOf(v1, v2).sortBy(comparator)
val items = arrayListOf(v1, v2).sortedWith(comparator)
assertEquals(v2, items[0])
assertEquals(v1, items[1])
}
@@ -49,7 +58,7 @@ class OrderingTest {
val diff = comparator.compare(v1, v2)
assertTrue(diff < 0)
val items = arrayListOf(v1, v2).sortBy(comparator)
val items = arrayListOf(v1, v2).sortedWith(comparator)
assertEquals(v1, items[0])
assertEquals(v2, items[1])
}
@@ -59,7 +68,7 @@ class OrderingTest {
val diff = comparator.compare(v1, v2)
assertTrue(diff < 0)
val items = arrayListOf(v1, v2).sortBy(comparator)
val items = arrayListOf(v1, v2).sortedWith(comparator)
assertEquals(v1, items[0])
assertEquals(v2, items[1])
}
@@ -68,7 +77,7 @@ class OrderingTest {
val comparator = compareBy<Item>({ it.name }, { it.rating })
val diff = comparator.compare(v1, v2)
assertTrue(diff > 0)
val items = arrayListOf(v1, v2).sortBy(comparator)
val items = arrayListOf(v1, v2).sortedWith(comparator)
assertEquals(v2, items[0])
assertEquals(v1, items[1])
}
@@ -85,7 +94,7 @@ class OrderingTest {
}
val diff = comparator.compare(v1, v2)
assertTrue(diff > 0)
val items = arrayListOf(v1, v2).sortBy(comparator)
val items = arrayListOf(v1, v2).sortedWith(comparator)
assertEquals(v2, items[0])
assertEquals(v1, items[1])
}
libraries/stdlib/test/collections/ArraysTest.kt
+3 -3
View File
@@ -827,9 +827,9 @@ class ArraysTest {
test fun sortedNullableBy() {
fun String.nullIfEmpty() = if (isEmpty()) null else this
arrayOf(null, "").let {
expect(listOf(null, "")) { it.sortedBy { it.orEmpty()}}
expect(listOf("", null)) { it.sortedByDescending { it.orEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it?.nullIfEmpty() }}
expect(listOf(null, "")) { it.sortedWith(compareBy<String> { it }.nullsFirst()) }
expect(listOf("", null)) { it.sortedWith(compareByDescending<String> { it }.nullsLast()) }
expect(listOf("", null)) { it.sortedWith(compareByDescending<String> { it.nullIfEmpty() }.nullsLast() ) }
}
}
libraries/stdlib/test/collections/CollectionTest.kt
+6 -3
View File
@@ -573,9 +573,12 @@ class CollectionTest {
test fun sortedNullableBy() {
fun String.nullIfEmpty() = if (isEmpty()) null else this
listOf(null, "").let {
expect(listOf(null, "")) { it.sortedBy { it.orEmpty()}}
expect(listOf("", null)) { it.sortedByDescending { it.orEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it?.nullIfEmpty() }}
// expect(listOf(null, "")) { it.sortedBy { it.orEmpty()}}
// expect(listOf("", null)) { it.sortedByDescending { it.orEmpty() }}
// expect(listOf("", null)) { it.sortedByDescending { it?.nullIfEmpty() }}
expect(listOf(null, "")) { it.sortedWith(compareBy<String> { it }.nullsFirst()) }
expect(listOf("", null)) { it.sortedWith(compareByDescending<String> { it }.nullsLast()) }
expect(listOf("", null)) { it.sortedWith(compareByDescending<String> { it.nullIfEmpty() }.nullsLast() ) }
}
}