diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt index c7b271862b6..efc3d461127 100644 --- a/libraries/stdlib/src/generated/_Arrays.kt +++ b/libraries/stdlib/src/generated/_Arrays.kt @@ -10600,7 +10600,6 @@ public fun BooleanArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Boolean): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Boolean = this@asList[index] override fun indexOf(o: Boolean): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Boolean): Int = this@asList.lastIndexOf(o) @@ -10616,7 +10615,6 @@ public fun ByteArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Byte): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Byte = this@asList[index] override fun indexOf(o: Byte): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Byte): Int = this@asList.lastIndexOf(o) @@ -10632,7 +10630,6 @@ public fun CharArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Char): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Char = this@asList[index] override fun indexOf(o: Char): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Char): Int = this@asList.lastIndexOf(o) @@ -10648,7 +10645,6 @@ public fun DoubleArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Double): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Double = this@asList[index] override fun indexOf(o: Double): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Double): Int = this@asList.lastIndexOf(o) @@ -10664,7 +10660,6 @@ public fun FloatArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Float): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Float = this@asList[index] override fun indexOf(o: Float): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Float): Int = this@asList.lastIndexOf(o) @@ -10680,7 +10675,6 @@ public fun IntArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Int): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Int = this@asList[index] override fun indexOf(o: Int): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Int): Int = this@asList.lastIndexOf(o) @@ -10696,7 +10690,6 @@ public fun LongArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Long): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Long = this@asList[index] override fun indexOf(o: Long): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Long): Int = this@asList.lastIndexOf(o) @@ -10712,7 +10705,6 @@ public fun ShortArray.asList(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: Short): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): Short = this@asList[index] override fun indexOf(o: Short): Int = this@asList.indexOf(o) override fun lastIndexOf(o: Short): Int = this@asList.lastIndexOf(o) diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt index 284783303a5..5551cde5ebc 100644 --- a/libraries/stdlib/test/collections/ArraysTest.kt +++ b/libraries/stdlib/test/collections/ArraysTest.kt @@ -1,5 +1,6 @@ package test.collections +import test.collections.behaviors.listBehavior import java.util.* import kotlin.test.* import org.junit.Test as test @@ -443,12 +444,12 @@ class ArraysTest { } @test fun asList() { - assertEquals(listOf(1, 2, 3), intArrayOf(1, 2, 3).asList()) - assertEquals(listOf(1, 2, 3), byteArrayOf(1, 2, 3).asList()) - assertEquals(listOf(true, false), booleanArrayOf(true, false).asList()) + compare(listOf(1, 2, 3), intArrayOf(1, 2, 3).asList()) { listBehavior() } + compare(listOf(1, 2, 3), byteArrayOf(1, 2, 3).asList()) { listBehavior() } + compare(listOf(true, false), booleanArrayOf(true, false).asList()) { listBehavior() } - assertEquals(listOf(1, 2, 3), arrayOf(1, 2, 3).asList()) - assertEquals(listOf("abc", "def"), arrayOf("abc", "def").asList()) + compare(listOf(1, 2, 3), arrayOf(1, 2, 3).asList()) { listBehavior() } + compare(listOf("abc", "def"), arrayOf("abc", "def").asList()) { listBehavior() } val ints = intArrayOf(1, 5, 7) val intsAsList = ints.asList() diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt index ebe1314535d..fe1d72eed70 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt @@ -250,7 +250,6 @@ fun specialJVM(): List { override val size: Int get() = this@asList.size() override fun isEmpty(): Boolean = this@asList.isEmpty() override fun contains(o: T): Boolean = this@asList.contains(o) - override fun iterator(): MutableIterator = this@asList.iterator() as MutableIterator override fun get(index: Int): T = this@asList[index] override fun indexOf(o: T): Int = this@asList.indexOf(o) override fun lastIndexOf(o: T): Int = this@asList.lastIndexOf(o)