From c1adec016d357f1c9f0213744468aa0cc91f4235 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Sun, 11 Nov 2018 17:05:47 -0600 Subject: [PATCH] Unsigned numbers samples in Okio Add sample for the experimental unsigned numbers introduced in Kotlin 1.3. New sample inline extension functions on BufferedSource and BufferedSink which allow reading and writing with unsigned numbers. --- .../jvmMain/kotlin/okio/samples/-Unsigned.kt | 373 ++++++++++++++++++ .../kotlin/okio/samples/UnsignedTest.kt | 281 +++++++++++++ 2 files changed, 654 insertions(+) create mode 100644 samples/src/jvmMain/kotlin/okio/samples/-Unsigned.kt create mode 100644 samples/src/jvmTest/kotlin/okio/samples/UnsignedTest.kt diff --git a/samples/src/jvmMain/kotlin/okio/samples/-Unsigned.kt b/samples/src/jvmMain/kotlin/okio/samples/-Unsigned.kt new file mode 100644 index 0000000000..08c9a0416a --- /dev/null +++ b/samples/src/jvmMain/kotlin/okio/samples/-Unsigned.kt @@ -0,0 +1,373 @@ +/* + * Copyright (C) 2019 Square, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:JvmName("-Unsigned") +@file:Suppress("NOTHING_TO_INLINE") // Syntactic sugar. + +package okio.samples + +import okio.BufferedSink +import okio.BufferedSource +import java.io.IOException + +/** Writes a unsigned byte to this sink. */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeUByte(b: UByte): S { + writeByte(b.toByte().toInt()) + return this +} + +/** + * Writes a big-endian, unsigned short to this sink using two bytes. + * ``` + * val buffer = Buffer() + * buffer.writeUShort(65534u.toUShort()) + * buffer.writeUShort(15u.toUShort()) + * + * assertEquals(4, buffer.size) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeUShort(b: UShort): S { + writeShort(b.toShort().toInt()) + return this +} + +/** + * Writes a little-endian, unsigned short to this sink using two bytes. + * ``` + * val buffer = Buffer() + * buffer.writeUShortLe(65534u.toUShort()) + * buffer.writeUShortLe(15u.toUShort()) + * + * assertEquals(4, buffer.size) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeUShortLe(b: UShort): S { + writeShortLe(b.toShort().toInt()) + return this +} + +/** + * Writes a big-endian, unsigned int to this sink using four bytes. + * ``` + * val buffer = Buffer() + * buffer.writeUInt(4294967294u) + * buffer.writeUInt(15u) + * + * assertEquals(8, buffer.size) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeUInt(b: UInt): S { + writeInt(b.toInt()) + return this +} + +/** + * Writes a little-endian, unsigned int to this sink using four bytes. + * ``` + * val buffer = Buffer() + * buffer.writeUIntLe(4294967294u) + * buffer.writeUIntLe(15u) + * + * assertEquals(8, buffer.size) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeUIntLe(b: UInt): S { + writeIntLe(b.toInt()) + return this +} + +/** + * Writes a big-endian, unsigned long to this sink using eight bytes. + * ``` + * val buffer = Buffer() + * buffer.writeULong(18446744073709551614uL) + * buffer.writeULong(15u) + * + * assertEquals(16, buffer.size) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeULong(b: ULong): S { + writeLong(b.toLong()) + return this +} + +/** + * Writes a little-endian, unsigned long to this sink using eight bytes. + * ``` + * val buffer = Buffer() + * buffer.writeULongLe(18446744073709551614uL) + * buffer.writeULongLe(15uL) + * + * assertEquals(16, buffer.size) + * assertEquals(0xfe.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0xff.toByte(), buffer.readByte()) + * assertEquals(0x0f.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0x00.toByte(), buffer.readByte()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun S.writeULongLe(b: ULong): S { + writeLongLe(b.toLong()) + return this +} + +/** Removes an unsigned byte from this source and returns it. */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readUByte(): UByte { + return readByte().toUByte() +} + +/** + * Removes two bytes from this source and returns a big-endian, unsigned short. + * ``` + * val buffer = Buffer() + * .writeByte(0xff) + * .writeByte(0xfe) + * .writeByte(0x00) + * .writeByte(0x0f) + * assertEquals(4, buffer.size) + * + * assertEquals(65534u.toUShort(), buffer.readUShort()) + * assertEquals(2, buffer.size) + * + * assertEquals(15u.toUShort(), buffer.readUShort()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readUShort(): UShort { + return readShort().toUShort() +} + +/** + * Removes two bytes from this source and returns a little-endian, unsigned short. + * ``` + * val buffer = Buffer() + * .writeByte(0xfe) + * .writeByte(0xff) + * .writeByte(0x0f) + * .writeByte(0x00) + * assertEquals(4, buffer.size) + * + * assertEquals(65534u.toUShort(), buffer.readUShortLe()) + * assertEquals(2, buffer.size) + * + * assertEquals(15u.toUShort(), buffer.readUShortLe()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readUShortLe(): UShort { + return readShortLe().toUShort() +} + +/** + * Removes four bytes from this source and returns a big-endian, unsigned int. + * ``` + * val buffer = Buffer() + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xfe) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x0f) + * assertEquals(4, buffer.size) + * + * assertEquals(4294967294u, buffer.readUInt()) + * assertEquals(2, buffer.size) + * + * assertEquals(15u, buffer.readUInt()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readUInt(): UInt { + return readInt().toUInt() +} + +/** + * Removes four bytes from this source and returns a little-endian, unsigned int. + * ``` + * val buffer = Buffer() + * .writeByte(0xfe) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0x0f) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * assertEquals(8, buffer.size) + * + * assertEquals(4294967294u, buffer.readUIntLe()) + * assertEquals(4, buffer.size) + * + * assertEquals(15u, buffer.readUIntLe()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readUIntLe(): UInt { + return readIntLe().toUInt() +} + +/** + * Removes eight bytes from this source and returns a big-endian, unsigned long. + * ``` + * val buffer = Buffer() + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xfe) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x0f) + * assertEquals(16, buffer.size) + * + * assertEquals(18446744073709551614uL, buffer.readULong()) + * assertEquals(8, buffer.size) + * + * assertEquals(15u, buffer.readULong()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readULong(): ULong { + return readLong().toULong() +} + +/** + * Removes eight bytes from this source and returns a little-endian, unsigned long. + * ``` + * val buffer = Buffer() + * .writeByte(0xfe) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0xff) + * .writeByte(0x0f) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * .writeByte(0x00) + * assertEquals(16, buffer.size) + * + * assertEquals(18446744073709551614uL, buffer.readULongLe()) + * assertEquals(8, buffer.size) + * + * assertEquals(15u, buffer.readULongLe()) + * assertEquals(0, buffer.size) + * ``` + */ +@ExperimentalUnsignedTypes +@Throws(IOException::class) +inline fun BufferedSource.readULongLe(): ULong { + return readLongLe().toULong() +} diff --git a/samples/src/jvmTest/kotlin/okio/samples/UnsignedTest.kt b/samples/src/jvmTest/kotlin/okio/samples/UnsignedTest.kt new file mode 100644 index 0000000000..cc9bba0544 --- /dev/null +++ b/samples/src/jvmTest/kotlin/okio/samples/UnsignedTest.kt @@ -0,0 +1,281 @@ +/* + * Copyright (C) 2019 Square, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:UseExperimental(ExperimentalUnsignedTypes::class) + +package okio.samples + +import okio.Buffer +import org.junit.Assert.assertEquals +import org.junit.Test + +class UnsignedTest { + @Test fun writeUnsignedByte() { + val buffer = Buffer() + buffer.writeUByte(254u.toUByte()) + buffer.writeUByte(15u.toUByte()) + + assertEquals(2, buffer.size) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedByte() { + val buffer = Buffer() + .writeByte(0xfe) + .writeByte(0x0f) + assertEquals(2, buffer.size) + + assertEquals(254u.toUByte(), buffer.readUByte()) + assertEquals(1, buffer.size) + + assertEquals(15u.toUByte(), buffer.readUByte()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedShort() { + val buffer = Buffer() + buffer.writeUShort(65534u.toUShort()) + buffer.writeUShort(15u.toUShort()) + + assertEquals(4, buffer.size) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedShort() { + val buffer = Buffer() + .writeByte(0xff) + .writeByte(0xfe) + .writeByte(0x00) + .writeByte(0x0f) + assertEquals(4, buffer.size) + + assertEquals(65534u.toUShort(), buffer.readUShort()) + assertEquals(2, buffer.size) + + assertEquals(15u.toUShort(), buffer.readUShort()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedShortLittleEndian() { + val buffer = Buffer() + buffer.writeUShortLe(65534u.toUShort()) + buffer.writeUShortLe(15u.toUShort()) + + assertEquals(4, buffer.size) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedShortLittleEndian() { + val buffer = Buffer() + .writeByte(0xfe) + .writeByte(0xff) + .writeByte(0x0f) + .writeByte(0x00) + assertEquals(4, buffer.size) + + assertEquals(65534u.toUShort(), buffer.readUShortLe()) + assertEquals(2, buffer.size) + + assertEquals(15u.toUShort(), buffer.readUShortLe()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedInt() { + val buffer = Buffer() + buffer.writeUInt(4294967294u) + buffer.writeUInt(15u) + + assertEquals(8, buffer.size) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedInt() { + val buffer = Buffer() + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xfe) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x0f) + assertEquals(8, buffer.size) + + assertEquals(4294967294u, buffer.readUInt()) + assertEquals(4, buffer.size) + + assertEquals(15u, buffer.readUInt()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedIntLittleEndian() { + val buffer = Buffer() + buffer.writeUIntLe(4294967294u) + buffer.writeUIntLe(15u) + + assertEquals(8, buffer.size) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedIntLittleEndian() { + val buffer = Buffer() + .writeByte(0xfe) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0x0f) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + assertEquals(8, buffer.size) + + assertEquals(4294967294u, buffer.readUIntLe()) + assertEquals(4, buffer.size) + + assertEquals(15u, buffer.readUIntLe()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedLong() { + val buffer = Buffer() + buffer.writeULong(18446744073709551614uL) + buffer.writeULong(15u) + + assertEquals(16, buffer.size) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedLong() { + val buffer = Buffer() + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xfe) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x0f) + assertEquals(16, buffer.size) + + assertEquals(18446744073709551614uL, buffer.readULong()) + assertEquals(8, buffer.size) + + assertEquals(15u, buffer.readULong()) + assertEquals(0, buffer.size) + } + + @Test fun writeUnsignedLongLittleEndian() { + val buffer = Buffer() + buffer.writeULongLe(18446744073709551614uL) + buffer.writeULongLe(15uL) + + assertEquals(16, buffer.size) + assertEquals(0xfe.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0xff.toByte(), buffer.readByte()) + assertEquals(0x0f.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0x00.toByte(), buffer.readByte()) + assertEquals(0, buffer.size) + } + + @Test fun readUnsignedLongLittleEndian() { + val buffer = Buffer() + .writeByte(0xfe) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0xff) + .writeByte(0x0f) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + .writeByte(0x00) + assertEquals(16, buffer.size) + + assertEquals(18446744073709551614uL, buffer.readULongLe()) + assertEquals(8, buffer.size) + + assertEquals(15u, buffer.readULongLe()) + assertEquals(0, buffer.size) + } +}