Remove unused Iterable extensions

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent 774744579d
commit 2b9f423e9a
  1. 29
      util/src/main/kotlin/org/openrs2/util/collect/IterableUtils.kt
  2. 55
      util/src/test/kotlin/org/openrs2/util/collect/IterableUtilsTest.kt

@ -1,29 +0,0 @@
package org.openrs2.util.collect
public fun <T> MutableIterable<T>.removeFirst(): T {
return removeFirstOrNull() ?: throw NoSuchElementException()
}
public fun <T> MutableIterable<T>.removeFirstOrNull(): T? {
val iterator = iterator()
if (!iterator.hasNext()) {
return null
}
val element = iterator.next()
iterator.remove()
return element
}
public inline fun <T> MutableIterable<T>.removeFirst(predicate: (T) -> Boolean): Boolean {
val iterator = iterator()
for (element in iterator) {
if (predicate(element)) {
iterator.remove()
return true
}
}
return false
}

@ -1,55 +0,0 @@
package org.openrs2.util.collect
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
class IterableUtilsTest {
@Test
fun testRemoveFirst() {
val list = mutableListOf(1, 2, 3)
assertEquals(1, list.removeFirst())
assertEquals(listOf(2, 3), list)
assertEquals(2, list.removeFirst())
assertEquals(listOf(3), list)
assertEquals(3, list.removeFirst())
assertEquals(emptyList(), list)
assertFailsWith<NoSuchElementException> {
list.removeFirst()
}
}
@Test
fun testRemoveFirstOrNull() {
val list = mutableListOf(1, 2, 3)
assertEquals(1, list.removeFirstOrNull())
assertEquals(listOf(2, 3), list)
assertEquals(2, list.removeFirstOrNull())
assertEquals(listOf(3), list)
assertEquals(3, list.removeFirstOrNull())
assertEquals(emptyList(), list)
assertNull(list.removeFirstOrNull())
}
@Test
fun testRemoveFirstMatching() {
val list = mutableListOf(1, 2, 2, 3)
assertTrue(list.removeFirst { it == 2 })
assertEquals(listOf(1, 2, 3), list)
assertTrue(list.removeFirst { it == 2 })
assertEquals(listOf(1, 3), list)
assertFalse(list.removeFirst { it == 2 })
assertEquals(listOf(1, 3), list)
}
}
Loading…
Cancel
Save