From 820d8c9bb4b702015d2297011f79b0cc83f665aa Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Sun, 14 Jul 2024 23:23:54 +0200 Subject: Rename File#open to File#read To match write. --- app/src/main/java/org/the_jk/cleversync/io/File.kt | 2 +- app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt | 2 +- app/src/test/java/org/the_jk/cleversync/LocalTreeTest.kt | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/the_jk/cleversync/io/File.kt b/app/src/main/java/org/the_jk/cleversync/io/File.kt index b5333eb..17f142a 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/File.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/File.kt @@ -8,5 +8,5 @@ interface File { val size: ULong val lastModified: Instant - fun open(): InputStream + fun read(): InputStream } diff --git a/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt b/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt index d8ca900..2ccc37c 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt @@ -56,7 +56,7 @@ internal class PathFile(private val path: Path) : ModifiableFile { override val lastModified: Instant get() = path.getLastModifiedTime().toInstant() - override fun open(): InputStream { + override fun read(): InputStream { return path.inputStream(StandardOpenOption.READ) } diff --git a/app/src/test/java/org/the_jk/cleversync/LocalTreeTest.kt b/app/src/test/java/org/the_jk/cleversync/LocalTreeTest.kt index e3f70d4..d9a9bd8 100644 --- a/app/src/test/java/org/the_jk/cleversync/LocalTreeTest.kt +++ b/app/src/test/java/org/the_jk/cleversync/LocalTreeTest.kt @@ -72,6 +72,9 @@ class LocalTreeTest { } assertThat(tree.list().files.safeValue()).contains(foo) assertThat(foo.size).isEqualTo(4.toULong()) + foo.read().use { + assertThat(it.readBytes()).isEqualTo(byteArrayOf(1, 2, 3, 4)) + } } @Test @@ -81,10 +84,13 @@ class LocalTreeTest { os.write(byteArrayOf(1, 2, 3, 4)) } foo.write().use { os -> - os.write(byteArrayOf(1)) + os.write(byteArrayOf(127)) assertThat(foo.size).isEqualTo(4.toULong()) } assertThat(foo.size).isEqualTo(1.toULong()) assertThat(tree.list().files.safeValue()).hasSize(1) + foo.read().use { + assertThat(it.readBytes()).isEqualTo(byteArrayOf(127)) + } } } -- cgit v1.2.3-70-g09d2