From aa543c66314dae92e7d67fbdd8c6008ff3ac06c9 Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Thu, 8 Apr 2021 02:24:58 +0300 Subject: [PATCH] Migrate stdlib, tests and samples to new case conversion api --- libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt | 2 ++ libraries/stdlib/jvm/test/text/StringJVMTest.kt | 4 ++++ .../stdlib/samples/test/samples/collections/collections.kt | 4 ++-- libraries/stdlib/samples/test/samples/misc/preconditions.kt | 2 +- libraries/stdlib/samples/test/samples/text/strings.kt | 2 ++ libraries/stdlib/test/text/CharTest.kt | 2 +- libraries/stdlib/test/text/StringTest.kt | 2 ++ 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt index 4270135ebe8..3245ad2f35d 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt @@ -717,6 +717,7 @@ public inline fun String.toPattern(flags: Int = 0): java.util.regex.Pattern { @Deprecated("Use replaceFirstChar instead.", ReplaceWith("replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }", "java.util.Locale")) @DeprecatedSinceKotlin(warningSince = "1.5") public actual fun String.capitalize(): String { + @Suppress("DEPRECATION") return capitalize(Locale.getDefault()) } @@ -759,6 +760,7 @@ public fun String.capitalize(locale: Locale): String { @Deprecated("Use replaceFirstChar instead.", ReplaceWith("replaceFirstChar { it.lowercase(Locale.getDefault()) }", "java.util.Locale")) @DeprecatedSinceKotlin(warningSince = "1.5") public actual fun String.decapitalize(): String { + @Suppress("DEPRECATION") return if (isNotEmpty() && !this[0].isLowerCase()) substring(0, 1).toLowerCase() + substring(1) else this } diff --git a/libraries/stdlib/jvm/test/text/StringJVMTest.kt b/libraries/stdlib/jvm/test/text/StringJVMTest.kt index 0e07ff1c7f6..ce8932e1b8c 100644 --- a/libraries/stdlib/jvm/test/text/StringJVMTest.kt +++ b/libraries/stdlib/jvm/test/text/StringJVMTest.kt @@ -74,6 +74,7 @@ class StringJVMTest { assertEquals("UTF-32BE", Charsets.UTF_32BE.name()) } + @Suppress("DEPRECATION") @Test fun capitalize() { fun testCapitalize(expected: String, string: String) { assertEquals(expected, string.capitalize()) @@ -90,6 +91,7 @@ class StringJVMTest { @Test fun decapitalize() { fun testDecapitalize(expected: String, string: String) { + @Suppress("DEPRECATION") assertEquals(expected, string.decapitalize()) assertEquals(expected, string.replaceFirstChar { it.lowercase(Locale.getDefault()) }) } @@ -98,6 +100,7 @@ class StringJVMTest { testDecapitalize("dzdzdz", "Dzdzdz") } + @Suppress("DEPRECATION") @Test fun capitalizeLocale() { fun testCapitalizeLocale(expected: String, string: String, locale: Locale) { assertEquals(expected, string.capitalize(locale)) @@ -122,6 +125,7 @@ class StringJVMTest { @Test fun decapitalizeLocale() { fun testDecapitalizeLocale(expected: String, string: String, locale: Locale) { + @Suppress("DEPRECATION") assertEquals(expected, string.decapitalize(locale)) assertEquals(expected, string.replaceFirstChar { it.lowercase(locale) }) } diff --git a/libraries/stdlib/samples/test/samples/collections/collections.kt b/libraries/stdlib/samples/test/samples/collections/collections.kt index 97e78d1314b..a64f822e059 100644 --- a/libraries/stdlib/samples/test/samples/collections/collections.kt +++ b/libraries/stdlib/samples/test/samples/collections/collections.kt @@ -475,7 +475,7 @@ class Collections { fun distinctAndDistinctBy() { val list = listOf('a', 'A', 'b', 'B', 'A', 'a') assertPrints(list.distinct(), "[a, A, b, B]") - assertPrints(list.distinctBy { it.toUpperCase() }, "[a, b]") + assertPrints(list.distinctBy { it.uppercaseChar() }, "[a, b]") } @Sample @@ -523,7 +523,7 @@ class Collections { assertPrints(numbers.joinToString(prefix = "<", postfix = ">", separator = "•"), "<1•2•3•4•5•6>") val chars = charArrayOf('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q') - assertPrints(chars.joinToString(limit = 5, truncated = "...!") { it.toUpperCase().toString() }, "A, B, C, D, E, ...!") + assertPrints(chars.joinToString(limit = 5, truncated = "...!") { it.uppercaseChar().toString() }, "A, B, C, D, E, ...!") } @Sample diff --git a/libraries/stdlib/samples/test/samples/misc/preconditions.kt b/libraries/stdlib/samples/test/samples/misc/preconditions.kt index be1943f1866..098b4a12dd1 100644 --- a/libraries/stdlib/samples/test/samples/misc/preconditions.kt +++ b/libraries/stdlib/samples/test/samples/misc/preconditions.kt @@ -40,7 +40,7 @@ class Preconditions { val requiredParam: String? = params["required"] requireNotNull(requiredParam) { "Required value must be non-null" } // now requiredParam is smartcast to String so that it is unnecessary to use the safe call(?.) - println(requiredParam.toUpperCase()) + println(requiredParam.uppercase()) } val params: MutableMap = mutableMapOf("required" to null) diff --git a/libraries/stdlib/samples/test/samples/text/strings.kt b/libraries/stdlib/samples/test/samples/text/strings.kt index 7a53afd86e7..251bf4baeaa 100644 --- a/libraries/stdlib/samples/test/samples/text/strings.kt +++ b/libraries/stdlib/samples/test/samples/text/strings.kt @@ -6,12 +6,14 @@ import kotlin.test.* class Strings { + @Suppress("DEPRECATION") @Sample fun capitalize() { assertPrints("abcd".capitalize(), "Abcd") assertPrints("Abcd".capitalize(), "Abcd") } + @Suppress("DEPRECATION") @Sample fun decapitalize() { assertPrints("abcd".decapitalize(), "abcd") diff --git a/libraries/stdlib/test/text/CharTest.kt b/libraries/stdlib/test/text/CharTest.kt index 20bad350974..38324600e4d 100644 --- a/libraries/stdlib/test/text/CharTest.kt +++ b/libraries/stdlib/test/text/CharTest.kt @@ -82,7 +82,7 @@ class CharTest { for (char in 'A'..'Z') { val digit = 10 + (char - 'A') - val lower = char.toLowerCase() + val lower = char.lowercaseChar() for (radix in digit + 1..36) { testEquals(digit, char, radix) diff --git a/libraries/stdlib/test/text/StringTest.kt b/libraries/stdlib/test/text/StringTest.kt index 26a1e463473..a94ec6b95cb 100644 --- a/libraries/stdlib/test/text/StringTest.kt +++ b/libraries/stdlib/test/text/StringTest.kt @@ -290,6 +290,7 @@ class StringTest { @Test fun capitalize() { fun testCapitalize(expected: String, string: String) { + @Suppress("DEPRECATION") assertEquals(expected, string.capitalize()) assertEquals(expected, string.replaceFirstChar { it.uppercase() }) } @@ -301,6 +302,7 @@ class StringTest { @Test fun decapitalize() { fun testDecapitalize(expected: String, string: String) { + @Suppress("DEPRECATION") assertEquals(expected, string.decapitalize()) assertEquals(expected, string.replaceFirstChar { it.lowercase() }) }