Merge pull request #26 from ae6rt/master
sorted set from Mark Petrovic merged with thanks!
This commit is contained in:
@@ -20,6 +20,9 @@ inline fun linkedList<T>(vararg values: T) : LinkedList<T> = values.to(LinkedLi
|
|||||||
/** Returns a new HashSet with a variable number of initial elements */
|
/** Returns a new HashSet with a variable number of initial elements */
|
||||||
inline fun hashSet<T>(vararg values: T) : HashSet<T> = values.to(HashSet<T>(values.size))
|
inline fun hashSet<T>(vararg values: T) : HashSet<T> = values.to(HashSet<T>(values.size))
|
||||||
|
|
||||||
|
/** Returns a new SortedSet with a variable number of initial elements */
|
||||||
|
inline fun sortedSet<T>(vararg values: T) : TreeSet<T> = values.to(TreeSet<T>())
|
||||||
|
|
||||||
inline fun <K,V> hashMap(): HashMap<K,V> = HashMap<K,V>()
|
inline fun <K,V> hashMap(): HashMap<K,V> = HashMap<K,V>()
|
||||||
|
|
||||||
inline fun <K,V> sortedMap(): SortedMap<K,V> = TreeMap<K,V>()
|
inline fun <K,V> sortedMap(): SortedMap<K,V> = TreeMap<K,V>()
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class CollectionTest() : TestCase() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testFilterIntoSortedSet() {
|
fun testFilterIntoSet() {
|
||||||
// TODO would be nice to avoid the <String>
|
// TODO would be nice to avoid the <String>
|
||||||
val foo = data.filterTo(hashSet<String>()){it.startsWith("f")}
|
val foo = data.filterTo(hashSet<String>()){it.startsWith("f")}
|
||||||
|
|
||||||
@@ -96,6 +96,16 @@ class CollectionTest() : TestCase() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun testFilterIntoSortedSet() {
|
||||||
|
// TODO would be nice to avoid the <String>
|
||||||
|
val sorted = data.filterTo(sortedSet<String>()){it.length == 3}
|
||||||
|
assertEquals(2, sorted.size)
|
||||||
|
assertEquals(sortedSet("bar", "foo"), sorted)
|
||||||
|
assertTrue {
|
||||||
|
sorted is TreeSet<String>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun testFind() {
|
fun testFind() {
|
||||||
val x = data.find{it.startsWith("x")}
|
val x = data.find{it.startsWith("x")}
|
||||||
assertNull(x)
|
assertNull(x)
|
||||||
|
|||||||
Reference in New Issue
Block a user