From f63cbcfd6aa8de178a92c5a1d6f1bb92e2073a94 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 25 Feb 2014 21:52:35 +0400 Subject: [PATCH] Delete wrong toString() extension, fix StringJVMTest --- libraries/stdlib/src/kotlin/ArraysJVM.kt | 4 +--- libraries/stdlib/test/StringJVMTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/stdlib/src/kotlin/ArraysJVM.kt b/libraries/stdlib/src/kotlin/ArraysJVM.kt index 44acc2573b9..235576a2241 100644 --- a/libraries/stdlib/src/kotlin/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/ArraysJVM.kt @@ -105,9 +105,7 @@ public val ByteArray.inputStream : ByteArrayInputStream public fun ByteArray.inputStream(offset: Int, length: Int) : ByteArrayInputStream = ByteArrayInputStream(this, offset, length) public fun ByteArray.toString(encoding: String): String = String(this, encoding) -public fun ByteArray.toString(): String = String(this) - -public fun ByteArray.toString(encoding: Charset) : String = String(this, encoding) +public fun ByteArray.toString(encoding: Charset): String = String(this, encoding) [Intrinsic("kotlin.collections.copyToArray")] public fun Collection.copyToArray(): Array = throw UnsupportedOperationException() diff --git a/libraries/stdlib/test/StringJVMTest.kt b/libraries/stdlib/test/StringJVMTest.kt index b4ba58b3103..621c982c048 100644 --- a/libraries/stdlib/test/StringJVMTest.kt +++ b/libraries/stdlib/test/StringJVMTest.kt @@ -324,8 +324,8 @@ class StringJVMTest { test fun toByteArrayEncodings() { val s = "hello" val defaultCharset = java.nio.charset.Charset.defaultCharset()!! - assertEquals(s.toByteArray().toString(), s.toByteArray(defaultCharset).toString()) - assertEquals(s.toByteArray().toString(), s.toByteArray(defaultCharset.name()).toString()) + assertEquals(String(s.toByteArray()), String(s.toByteArray(defaultCharset))) + assertEquals(String(s.toByteArray()), String(s.toByteArray(defaultCharset.name()))) } test fun testReplaceAllClosure() {