StdLib cleanup, deprecated symbol usage: size() and length()

This commit is contained in:
Ilya Gorbunov
2015-11-14 05:56:57 +03:00
parent 21e2e68ed4
commit 07654eb82b
59 changed files with 730 additions and 730 deletions
+1 -1
View File
@@ -137,7 +137,7 @@ class RegexTest {
@test fun replaceEvaluator() {
val input = "/12/456/7890/"
val pattern = "\\d+".toRegex()
assertEquals("/2/3/4/", pattern.replace(input, { it.value.length().toString() } ))
assertEquals("/2/3/4/", pattern.replace(input, { it.value.length.toString() } ))
}
@@ -32,8 +32,8 @@ class StringBuilderTest {
val result = sb.toString()
val cs = sb as CharSequence
assertEquals(result.length(), cs.length())
assertEquals(result.length(), sb.length())
assertEquals(result.length, cs.length)
assertEquals(result.length, sb.length)
for (index in result.indices) {
assertEquals(result[index], sb[index])
assertEquals(result[index], cs[index])
@@ -43,22 +43,22 @@ class StringBuilderTest {
@test fun constructors() {
StringBuilder().let { sb ->
assertEquals(0, sb.length())
assertEquals(0, sb.length)
assertEquals("", sb.toString())
}
StringBuilder(16).let { sb ->
assertEquals(0, sb.length())
assertEquals(0, sb.length)
assertEquals("", sb.toString())
}
StringBuilder("content").let { sb ->
assertEquals(7, sb.length())
assertEquals(7, sb.length)
assertEquals("content", sb.toString())
}
StringBuilder(StringBuilder("content")).let { sb ->
assertEquals(7, sb.length())
assertEquals(7, sb.length)
assertEquals("content", sb.toString())
}
}
+4 -4
View File
@@ -927,7 +927,7 @@ class StringTest {
assertFails {
data.drop(-2)
}
assertEquals("", data.drop(data.length() + 5))
assertEquals("", data.drop(data.length + 5))
}
@test fun dropCharSequence() = withOneCharSequenceArg("abcd1234") { data ->
@@ -935,7 +935,7 @@ class StringTest {
assertFails {
data.drop(-2)
}
assertContentEquals("", data.drop(data.length() + 5))
assertContentEquals("", data.drop(data.length + 5))
}
@test fun takeWhile() {
@@ -957,7 +957,7 @@ class StringTest {
assertFails {
data.take(-7)
}
assertEquals(data, data.take(data.length() + 42))
assertEquals(data, data.take(data.length + 42))
}
@test fun takeCharSequence() = withOneCharSequenceArg("abcd1234") { data ->
@@ -1102,7 +1102,7 @@ ${" "}
`XP ' '''''' YPXXXXXX' ''''''`''YPPP
""".trimIndent()
assertEquals(23, deindented.lines().size())
assertEquals(23, deindented.lines().size)
val indents = deindented.lines().map { "^\\s*".toRegex().find(it)!!.value.length }
assertEquals(0, indents.min())
assertEquals(42, indents.max())