azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup more test files and directories after tests

Browse Source 
#KT-19192
This commit is contained in:
Ilya Gorbunov
2020-10-23 03:00:26 +03:00
parent fe098ec821
commit 0fa2cc15de
3 changed files with 176 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jdk7/test/AbstractPathTest.kt
+34
View File
@@ -0,0 +1,34 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlin.jdk7.test
import java.nio.file.Path
import kotlin.io.path.deleteIfExists
import kotlin.test.*
abstract class AbstractPathTest {
private val cleanUpActions = mutableListOf<Pair<Path, (Path) -> Unit>>()
fun Path.cleanup(): Path {
cleanUpActions.add(this to { it.deleteIfExists() })
return this
}
fun Path.cleanupRecursively(): Path {
cleanUpActions.add(this to { it.toFile().deleteRecursively() })
return this
}
@AfterTest
fun cleanUp() {
for ((path, action) in cleanUpActions) {
try {
action(path)
} catch (e: Throwable) {
println("Failed to execute cleanup action for $path")
}
}
}
}
libraries/stdlib/jdk7/test/PathExtensionsTest.kt
+27 -43
View File
@@ -12,7 +12,7 @@ import kotlin.io.path.*
import kotlin.random.Random
import kotlin.test.*
class PathExtensionsTest {
class PathExtensionsTest : AbstractPathTest() {
private val isCaseInsensitiveFileSystem = Path("C:/") == Path("c:/")
private val isBackslashSeparator = FileSystems.getDefault().separator == "\\"
@@ -46,7 +46,7 @@ class PathExtensionsTest {
@Test
fun createNewFile() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
val file = dir / "new-file"
@@ -61,9 +61,10 @@ class PathExtensionsTest {
@Test
fun copyTo() {
val srcFile = createTempFile()
val dstFile = createTempFile()
try {
val root = createTempDirectory("copyTo-root").cleanupRecursively()
val srcFile = createTempFile(root, "src")
val dstFile = createTempFile(root, "dst")
srcFile.writeText("Hello, World!")
assertFailsWith<FileAlreadyExistsException>("copy do not overwrite existing file") {
srcFile.copyTo(dstFile)
@@ -126,18 +127,14 @@ class PathExtensionsTest {
assertFailsWith<DirectoryNotEmptyException>("copy dir do not overwrite non-empty dir") {
srcFile.copyTo(dstFile, overwrite = true)
}
} finally {
srcFile.toFile().deleteRecursively()
dstFile.toFile().deleteRecursively()
}
}
@Test
fun copyToNameWithoutParent() {
val currentDir = Path("").toAbsolutePath()
val srcFile = createTempFile()
val dstFile = createTempFile(directory = currentDir)
try {
val srcFile = createTempFile().cleanup()
val dstFile = createTempFile(directory = currentDir).cleanup()
srcFile.writeText("Hello, World!", Charsets.UTF_8)
dstFile.deleteExisting()
@@ -146,19 +143,15 @@ class PathExtensionsTest {
srcFile.copyTo(dstRelative)
assertEquals(srcFile.readText(), dstFile.readText())
} finally {
dstFile.deleteExisting()
srcFile.deleteExisting()
}
}
@Test
fun moveTo() {
val original = createTempFile()
val srcFile = createTempFile()
val dstFile = createTempFile()
val root = createTempDirectory("moveTo-root").cleanupRecursively()
val original = createTempFile(root, "original")
val srcFile = createTempFile(root, "src")
val dstFile = createTempFile(root, "dst")
fun restoreSrcFile() { original.copyTo(srcFile, overwrite = true) }
try {
original.writeText("Hello, World!")
restoreSrcFile()
@@ -214,10 +207,6 @@ class PathExtensionsTest {
srcFile.moveTo(dstFile, overwrite = true)
assertTrue(dstFile.isDirectory())
assertEquals(listOf(dstFile / "somefile"), dstFile.listDirectoryEntries(), "directory is moved with its content")
} finally {
srcFile.toFile().deleteRecursively()
dstFile.toFile().deleteRecursively()
}
}
private fun compareFiles(src: Path, dst: Path, message: String? = null) {
@@ -231,7 +220,7 @@ class PathExtensionsTest {
@Test
fun fileSize() {
val file = createTempFile()
val file = createTempFile().cleanup()
assertEquals(0, file.fileSize())
file.writeBytes(ByteArray(100))
@@ -246,29 +235,29 @@ class PathExtensionsTest {
@Test
fun deleteExisting() {
val file = createTempFile()
val file = createTempFile().cleanup()
file.deleteExisting()
assertFailsWith<NoSuchFileException> { file.deleteExisting() }
val dir = createTempDirectory()
val dir = createTempDirectory().cleanup()
dir.deleteExisting()
assertFailsWith<NoSuchFileException> { dir.deleteExisting() }
}
@Test
fun deleteIfExists() {
val file = createTempFile()
val file = createTempFile().cleanup()
assertTrue(file.deleteIfExists())
assertFalse(file.deleteIfExists())
val dir = createTempDirectory()
val dir = createTempDirectory().cleanup()
assertTrue(dir.deleteIfExists())
assertFalse(dir.deleteIfExists())
}
@Test
fun attributeGettersOnFile() {
val file = createTempFile("temp", ".file")
val file = createTempFile("temp", ".file").cleanup()
assertTrue(file.exists())
assertFalse(file.notExists())
assertTrue(file.isRegularFile())
@@ -282,12 +271,11 @@ class PathExtensionsTest {
// they don't throw an exception.
file.isExecutable()
file.isHidden()
file.deleteExisting()
}
@Test
fun attributeGettersOnDirectory() {
val file = createTempDirectory(".tmpdir")
val file = createTempDirectory(".tmpdir").cleanup()
assertTrue(file.exists())
assertFalse(file.notExists())
assertFalse(file.isRegularFile())
@@ -299,12 +287,11 @@ class PathExtensionsTest {
file.isExecutable()
file.isHidden()
file.deleteExisting()
}
@Test
fun attributeGettersOnNonExistentPath() {
val file = createTempDirectory().resolve("foo")
val file = createTempDirectory().cleanup().resolve("foo")
assertFalse(file.exists())
assertTrue(file.notExists())
assertFalse(file.isRegularFile())
@@ -321,7 +308,6 @@ class PathExtensionsTest {
assertFalse(file.isHidden())
} catch (e: IOException) {
}
file.parent.deleteExisting()
}
private interface SpecialFileAttributesView : FileAttributeView
@@ -329,7 +315,7 @@ class PathExtensionsTest {
@Test
fun readWriteAttributes() {
val file = createTempFile()
val file = createTempFile().cleanup()
val modifiedTime = file.getLastModifiedTime()
assertEquals(modifiedTime, file.getAttribute("lastModifiedTime"))
assertEquals(modifiedTime, file.getAttribute("basic:lastModifiedTime"))
@@ -358,13 +344,11 @@ class PathExtensionsTest {
file.setAttribute("lastModifiedTime", null)
assertEquals(newTime3, file.getLastModifiedTime())
file.deleteExisting()
}
@Test
fun links() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
val original = createTempFile(dir)
original.writeBytes(Random.nextBytes(100))
@@ -385,7 +369,7 @@ class PathExtensionsTest {
@Test
fun symlinks() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
val original = createTempFile(dir)
original.writeBytes(Random.nextBytes(100))
@@ -406,7 +390,7 @@ class PathExtensionsTest {
@Test
fun directoryEntriesList() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
assertEquals(0, dir.listDirectoryEntries().size)
val file = dir.resolve("f1").createFile()
@@ -420,7 +404,7 @@ class PathExtensionsTest {
@Test
fun directoryEntriesUseSequence() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
assertEquals(0, dir.useDirectoryEntries { it.toList() }.size)
val file = dir.resolve("f1").createFile()
@@ -434,7 +418,7 @@ class PathExtensionsTest {
@Test
fun directoryEntriesForEach() {
val dir = createTempDirectory()
val dir = createTempDirectory().cleanupRecursively()
dir.forEachDirectoryEntry { error("shouldn't get here, but received $it") }
val file = createTempFile(dir)
libraries/stdlib/jdk7/test/PathReadWriteTest.kt
+7 -11
View File
@@ -5,28 +5,26 @@
package kotlin.jdk7.test
import java.nio.file.Files
import java.nio.file.StandardOpenOption
import kotlin.io.path.*
import kotlin.random.Random
import kotlin.test.*
class PathReadWriteTest {
class PathReadWriteTest : AbstractPathTest() {
@Test
fun appendText() {
val file = createTempFile()
val file = createTempFile().cleanup()
file.writeText("Hello\n")
file.appendText("World\n")
file.writeText("Again", Charsets.US_ASCII, StandardOpenOption.APPEND)
assertEquals("Hello\nWorld\nAgain", file.readText())
assertEquals(listOf("Hello", "World", "Again"), file.readLines(Charsets.UTF_8))
file.deleteExisting()
}
@Test
fun file() {
val file = createTempFile()
val file = createTempFile().cleanup()
val writer = file.outputStream().writer().buffered()
writer.write("Hello")
@@ -68,13 +66,11 @@ class PathReadWriteTest {
c = 0
file.forEachLine { c++ }
assertEquals(2, c)
file.toFile().deleteOnExit()
}
@Test
fun bufferedReader() {
val file = createTempFile()
val file = createTempFile().cleanup()
val lines = listOf("line1", "line2")
file.writeLines(lines)
@@ -84,7 +80,7 @@ class PathReadWriteTest {
@Test
fun bufferedWriter() {
val file = createTempFile()
val file = createTempFile().cleanup()
file.bufferedWriter().use { it.write("line1\n") }
file.bufferedWriter(Charsets.UTF_8, 1024, StandardOpenOption.APPEND).use { it.write("line2\n") }
@@ -94,7 +90,7 @@ class PathReadWriteTest {
@Test
fun writeBytes() {
val file = createTempFile()
val file = createTempFile().cleanup()
file.writeBytes("Hello".encodeToByteArray())
file.appendBytes(" world!".encodeToByteArray())
assertEquals(file.readText(), "Hello world!")
@@ -107,7 +103,7 @@ class PathReadWriteTest {
@Test
fun writeLines() {
val file = createTempFile()
val file = createTempFile().cleanup()
val lines = listOf("first line", "second line")
file.writeLines(lines)
assertEquals(lines, file.readLines())