Cleanup

Author: fzhinkin

core/apple/test/NSInputStreamSourceTest.kt

@@ -5,6 +5,7 @@
 
 package kotlinx.io
 
+import kotlinx.io.files.FileSystem
 import kotlinx.io.files.Path
 import kotlinx.io.files.sink
 import platform.Foundation.NSInputStream
@@ -38,7 +39,7 @@ class NSInputStreamSourceTest {
             assertEquals(7, source.readAtMostTo(buffer, 10))
             assertEquals("example", buffer.readString())
         } finally {
-            deleteFile(file)
+            FileSystem.System.delete(Path(file))
         }
     }
 

core/common/src/files/Paths.kt

@@ -110,7 +110,7 @@ public expect fun Path.source(): Source
  * overwrites contents.
  */
 @Deprecated(
-    message = "Use FileSystem.sink instead",
+    message = "Use FileSystem.write instead",
     replaceWith = ReplaceWith(
         expression = "FileSystem.System.write(this)",
         imports = arrayOf("kotlinx.io.files.FileSystem")

core/common/test/util.kt

@@ -40,7 +40,6 @@ fun assertNoEmptySegments(buffer: Buffer) {
 }
 
 expect fun tempFileName(): String
-expect fun deleteFile(path: String)
 
 private fun fromHexChar(char: Char): Int {
     val code = char.code

core/js/test/utils.kt

@@ -47,10 +47,3 @@ actual fun tempFileName(): String {
         return fullpath
     }
 }
-
-actual fun deleteFile(path: String) {
-    if (!fs.existsSync(path) as Boolean) {
-        throw IOException("File does not exist: $path")
-    }
-    fs.rmSync(path)
-}

core/jvm/test/utilJVM.kt

@@ -6,8 +6,6 @@ package kotlinx.io
 
 import kotlinx.io.files.FileSystem
 import java.io.File
-import java.nio.file.Files
-import java.nio.file.Paths
 import kotlin.random.Random
 import kotlin.test.assertEquals
 
@@ -23,13 +21,6 @@ actual fun tempFileName(): String {
     }
 }
 
-actual fun deleteFile(path: String) {
-    if (!Files.isRegularFile(Paths.get(path))) {
-        throw IllegalArgumentException("Path is not a file: $path.")
-    }
-    Files.delete(Paths.get(path))
-}
-
 fun assertByteArrayEquals(expectedUtf8: String, b: ByteArray) {
     assertEquals(expectedUtf8, b.toString(Charsets.UTF_8))
 }

core/native/test/util.kt

@@ -8,9 +8,9 @@
 package kotlinx.io
 
 import kotlinx.cinterop.UnsafeNumber
-import kotlinx.cinterop.toKString
 import kotlinx.io.files.FileSystem
-import platform.posix.*
+import platform.posix.F_OK
+import platform.posix.access
 import kotlin.random.Random
 
 @OptIn(UnsafeNumber::class, ExperimentalStdlibApi::class)
@@ -25,10 +25,3 @@ actual fun tempFileName(): String {
     }
     throw IOException("Failed to generate temp file name")
 }
-
-actual fun deleteFile(path: String) {
-    if (access(path, F_OK) != 0) throw IOException("File does not exist: $path")
-    if (remove(path) != 0) {
-        throw IOException("Failed to delete file $path: ${strerror(errno)?.toKString()}")
-    }
-}

core/wasm/test/utils.kt

@@ -8,5 +8,3 @@ package kotlinx.io
 import kotlinx.io.files.unsupported
 
 actual fun tempFileName(): String = unsupported()
-
-actual fun deleteFile(path: String): Unit = unsupported()