Replace explicit input usage in tests by read

Author: altavir

core/commonMain/src/kotlinx/io/Bytes.kt

@@ -8,7 +8,7 @@ internal typealias BytesPointer = Int
 /**
  * Read-only bytes container.
  *
- * Use [input] to create readable [Input].
+ * Use [read] to safely create and dispose an input
  * All inputs from a [Bytes] instance are share the same buffers.
  *
  * ```
@@ -32,13 +32,15 @@ class Bytes internal constructor(internal val bufferPool: ObjectPool<Buffer>) :
 
     /**
      * Create [Input] view on content.
+     *
      */
+    @Deprecated(message = "Unsafe input usage", level = DeprecationLevel.WARNING)
     fun input(): Input = object : Input(this@Bytes) {
         override fun closeSource() {}
         override fun fill(buffer: Buffer): Int = 0
     }
 
-    @Suppress("OVERRIDE_BY_INLINE")
+    @Suppress("OVERRIDE_BY_INLINE", "DEPRECATION")
     override inline fun <R> read(reader: Input.() -> R): R = input().use(reader)
 
     override fun toString() = "Bytes($head..$tail)"

core/commonTest/src/kotlinx/io/tests/BytesTest.kt

@@ -28,25 +28,26 @@ class BytesTest {
 
         assertEquals(2 + 2 + 2 + 4 + 8 + 4 + 8 + 8 + 3, bytes.size)
 
-        val input = bytes.input()
-        val ba = ByteArray(2)
-        input.readArray(ba)
+        bytes.read {
+            val ba = ByteArray(2)
+            readArray(ba)
 
-        assertEquals(0x11, ba[0])
-        assertEquals(0x22, ba[1])
+            assertEquals(0x11, ba[0])
+            assertEquals(0x22, ba[1])
 
-        assertEquals(0x12, input.readByte())
-        assertEquals(0x82u, input.readUByte())
-        assertEquals(0x3456, input.readShort())
-        assertEquals(0x789abcde, input.readInt())
-        assertEquals(1.25, input.readDouble())
-        assertEquals(1.25f, input.readFloat())
+            assertEquals(0x12, readByte())
+            assertEquals(0x82u, readUByte())
+            assertEquals(0x3456, readShort())
+            assertEquals(0x789abcde, readInt())
+            assertEquals(1.25, readDouble())
+            assertEquals(1.25f, readFloat())
 
-        val ll = (1..8).map { input.readByte().toInt() and 0xff }.joinToString()
-        assertEquals("18, 52, 86, 120, 154, 188, 222, 240", ll)
-        assertEquals(0x123456789abcdef0, input.readLong())
+            val ll = (1..8).map { readByte().toInt() and 0xff }.joinToString()
+            assertEquals("18, 52, 86, 120, 154, 188, 222, 240", ll)
+            assertEquals(0x123456789abcdef0, readLong())
 
-        assertEquals("OK", input.readUTF8Line())
+            assertEquals("OK", readUTF8Line())
+        }
     }
 
     @Test
@@ -83,9 +84,10 @@ class BytesTest {
         buildBytes {
             writeArray(ByteArray(9999))
         }.use { buffer ->
-            val input = buffer.input()
-            input.readArray(ByteArray(9999))
-            assertTrue { input.eof() }
+            buffer.read {
+                readArray(ByteArray(9999))
+                assertTrue { eof() }
+            }
         }
     }
 
@@ -122,8 +124,6 @@ class BytesTest {
             }
             assertTrue { eof() }
         }
-
-
     }
 
     @Test
@@ -134,7 +134,6 @@ class BytesTest {
         }.read {
             assertTrue { eof() }
         }
-
     }
 
     @Test

core/commonTest/src/kotlinx/io/tests/OutputTest.kt

@@ -1,18 +1,19 @@
 package kotlinx.io.tests
 
-import kotlinx.io.*
-import kotlin.test.*
+import kotlinx.io.buildBytes
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class OutputTest {
     @Test
     fun testBuildBytes() {
-        val bytes = buildBytes {
+        buildBytes {
             writeLong(0x0001020304050607)
             writeLong(0x08090A0B0C0D0E0F)
             writeInt(0x08090A0B)
             writeInt(0x00010203)
-        }
-        bytes.input().apply { 
+        }.read {
             assertFalse(eof())
             assertReadLong(0x0001020304050607)
             assertReadLong(0x08090A0B0C0D0E0F)
@@ -24,14 +25,13 @@ class OutputTest {
 
     @Test
     fun testBuildBytesChunked() {
-        val bytes = buildBytes(2) {
+        buildBytes(2) {
             writeByte(0xFF.toByte())
             writeInt(0x08090A0B)
             writeInt(0x00010203)
             writeInt(0xAB023F3)
             writeInt(0xDEAD) // by writing unit tests
-        }
-        bytes.input().apply {
+        }.read {
             assertFalse(eof())
             assertReadByte(0xFF.toByte())
             assertReadInt(0x08090A0B)

core/commonTest/src/kotlinx/io/tests/text/InputStringTest.kt

@@ -20,15 +20,17 @@ class InputStringTest {
 
     @Test
     fun decodeUtf8FromInputUntil() = bufferSizes.forEach { size ->
-        val input = buildBytes(size) { writeArray(content) }.input()
-        val result = input.readUTF8StringUntilDelimiter('.')
-        assertEquals(expected.dropLast(1), result)
+        buildBytes(size) { writeArray(content) }.read {
+            val result = readUTF8StringUntilDelimiter('.')
+            assertEquals(expected.dropLast(1), result)
+        }
     }
 
     @Test
     fun decodeUtf8FromInput() = bufferSizes.forEach { size ->
-        val input = buildBytes(size) { writeArray(content) }.input()
-        val result = input.readUTF8String(expected.length)
-        assertEquals(expected, result)
+        buildBytes(size) { writeArray(content) }.read {
+            val result = readUTF8String(expected.length)
+            assertEquals(expected, result)
+        }
     }
 }