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

Fix Iterable, Sequence and String index overflow in windowed

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2019-10-08 11:21:57 +03:00
parent 42740c8b97
commit e54b405fe4
6 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/collections/IterableTests.kt
+18
View File
@@ -199,6 +199,24 @@ abstract class OrderedIterableTests<T : Iterable<String>>(createFrom: (Array<out
assertFailsWith<IllegalArgumentException>("size $illegalValue") { data.windowed(illegalValue, 1) }
assertFailsWith<IllegalArgumentException>("step $illegalValue") { data.windowed(1, illegalValue) }
}
// index overflow tests
for (partialWindows in listOf(true, false)) {
val windowed1 = data.windowed(5, Int.MAX_VALUE, partialWindows)
assertEquals(data.take(5), windowed1.single())
val windowed2 = data.windowed(Int.MAX_VALUE, 5, partialWindows)
assertEquals(if (partialWindows) listOf(data.toList(), listOf("5", "6")) else listOf(), windowed2)
val windowed3 = data.windowed(Int.MAX_VALUE, Int.MAX_VALUE, partialWindows)
assertEquals(if (partialWindows) listOf(data.toList()) else listOf(), windowed3)
val windowedTransform1 = data.windowed(5, Int.MAX_VALUE, partialWindows) { it.joinToString("") }
assertEquals("01234", windowedTransform1.single())
val windowedTransform2 = data.windowed(Int.MAX_VALUE, 5, partialWindows) { it.joinToString("") }
assertEquals(if (partialWindows) listOf("0123456", "56") else listOf(), windowedTransform2)
val windowedTransform3 = data.windowed(Int.MAX_VALUE, Int.MAX_VALUE, partialWindows) { it.joinToString("") }
assertEquals(if (partialWindows) listOf("0123456") else listOf(), windowedTransform3)
}
}
libraries/stdlib/test/collections/SequenceTest.kt
+18
View File
@@ -311,6 +311,24 @@ public class SequenceTest {
}
ensureIsIntermediate(source = sequenceOf(1, 2, 3)) { it.windowed(2, 1) }
// index overflow tests
for (partialWindows in listOf(true, false)) {
val windowed1 = seq.windowed(5, Int.MAX_VALUE, partialWindows)
assertEquals(seq.take(5).toList(), windowed1.single())
val windowed2 = seq.windowed(Int.MAX_VALUE, 5, partialWindows)
assertEquals(if (partialWindows) listOf(seq.toList(), listOf(5, 6)) else listOf(), windowed2.toList())
val windowed3 = seq.windowed(Int.MAX_VALUE, Int.MAX_VALUE, partialWindows)
assertEquals(if (partialWindows) listOf(seq.toList()) else listOf(), windowed3.toList())
val windowedTransform1 = seq.windowed(5, Int.MAX_VALUE, partialWindows) { it.joinToString("") }
assertEquals("01234", windowedTransform1.single())
val windowedTransform2 = seq.windowed(Int.MAX_VALUE, 5, partialWindows) { it.joinToString("") }
assertEquals(if (partialWindows) listOf("0123456", "56") else listOf(), windowedTransform2.toList())
val windowedTransform3 = seq.windowed(Int.MAX_VALUE, Int.MAX_VALUE, partialWindows) { it.joinToString("") }
assertEquals(if (partialWindows) listOf("0123456") else listOf(), windowedTransform3.toList())
}
}
@Test fun zip() {