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

Minor: normalize '@Test' annotation casing in all tests.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-11-16 21:26:39 +03:00
parent 50cd620f92
commit 6a70761783
48 changed files with 749 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/io/Files.kt
+27 -27
View File
@@ -3,7 +3,7 @@ package test.io
import java.io.*
import java.util.*
import org.junit.Test as test
import org.junit.Test
import kotlin.io.walkTopDown
import kotlin.test.*
@@ -13,13 +13,13 @@ class FilesTest {
private val isBackslashSeparator = File.separatorChar == '\\'
@test fun testPath() {
@Test fun testPath() {
val fileSuf = System.currentTimeMillis().toString()
val file1 = createTempFile("temp", fileSuf)
assertTrue(file1.path.endsWith(fileSuf), file1.path)
}
@test fun testCreateTempDir() {
@Test fun testCreateTempDir() {
val dirSuf = System.currentTimeMillis().toString()
val dir1 = createTempDir("temp", dirSuf)
assertTrue(dir1.exists() && dir1.isDirectory && dir1.name.startsWith("temp") && dir1.name.endsWith(dirSuf))
@@ -38,7 +38,7 @@ class FilesTest {
dir3.delete()
}
@test fun testCreateTempFile() {
@Test fun testCreateTempFile() {
val fileSuf = System.currentTimeMillis().toString()
val file1 = createTempFile("temp", fileSuf)
assertTrue(file1.exists() && file1.name.startsWith("temp") && file1.name.endsWith(fileSuf))
@@ -57,7 +57,7 @@ class FilesTest {
file3.delete()
}
@test fun listFilesWithFilter() {
@Test fun listFilesWithFilter() {
val dir = createTempDir("temp")
createTempFile("temp1", ".kt", dir)
@@ -72,7 +72,7 @@ class FilesTest {
assertEquals(2, result2!!.size)
}
@test fun relativeToRooted() {
@Test fun relativeToRooted() {
val file1 = File("/foo/bar/baz")
val file2 = File("/foo/baa/ghoo")
@@ -116,7 +116,7 @@ class FilesTest {
}
}
@test fun relativeToRelative() {
@Test fun relativeToRelative() {
val nested = File("foo/bar")
val base = File("foo")
@@ -150,7 +150,7 @@ class FilesTest {
}
}
@test fun relativeToFails() {
@Test fun relativeToFails() {
val absolute = File("/foo/bar/baz")
val relative = File("foo/bar")
val networkShare1 = File("""\\my.host\share1/folder""")
@@ -177,7 +177,7 @@ class FilesTest {
}
}
@test fun relativeTo() {
@Test fun relativeTo() {
assertEquals("kotlin", File("src/kotlin").toRelativeString(File("src")))
assertEquals("", File("dir").toRelativeString(File("dir")))
assertEquals("..", File("dir").toRelativeString(File("dir/subdir")))
@@ -192,7 +192,7 @@ class FilesTest {
assertEquals(elements, components.segments.map { it.toString() })
}
@test fun filePathComponents() {
@Test fun filePathComponents() {
checkFilePathComponents(File("/foo/bar"), File("/"), listOf("foo", "bar"))
checkFilePathComponents(File("/foo/bar/gav"), File("/"), listOf("foo", "bar", "gav"))
checkFilePathComponents(File("/foo/bar/gav/"), File("/"), listOf("foo", "bar", "gav"))
@@ -213,7 +213,7 @@ class FilesTest {
checkFilePathComponents(File(".."), File(""), listOf(".."))
}
@test fun fileRoot() {
@Test fun fileRoot() {
val rooted = File("/foo/bar")
assertTrue(rooted.isRooted)
// assertEquals("/", rooted.root.invariantSeparatorsPath)
@@ -233,7 +233,7 @@ class FilesTest {
// assertEquals("", relative.rootName)
}
@test fun startsWith() {
@Test fun startsWith() {
assertTrue(File("foo/bar").startsWith(File("foo/bar")))
assertTrue(File("foo/bar").startsWith(File("foo")))
assertTrue(File("foo/bar").startsWith(""))
@@ -258,7 +258,7 @@ class FilesTest {
}
}
@test fun endsWith() {
@Test fun endsWith() {
assertTrue(File("/foo/bar").endsWith("bar"))
assertTrue(File("/foo/bar").endsWith("foo/bar"))
assertTrue(File("/foo/bar").endsWith("/foo/bar"))
@@ -277,7 +277,7 @@ class FilesTest {
}
/*
@test fun subPath() {
@Test fun subPath() {
if (isBackslashSeparator) {
// Check only in Windows
assertEquals(File("mike"), File("//my.host.net/home/mike/temp").subPath(0, 1))
@@ -289,7 +289,7 @@ class FilesTest {
}
*/
@test fun normalize() {
@Test fun normalize() {
assertEquals(File("/foo/bar/baaz"), File("/foo/./bar/gav/../baaz").normalize())
assertEquals(File("/foo/bar/baaz"), File("/foo/bak/../bar/gav/../baaz").normalize())
assertEquals(File("../../bar"), File("../foo/../../bar").normalize())
@@ -302,7 +302,7 @@ class FilesTest {
assertEquals(File("/../foo"), File("/bar/../../foo").normalize())
}
@test fun resolve() {
@Test fun resolve() {
assertEquals(File("/foo/bar/gav"), File("/foo/bar").resolve("gav"))
assertEquals(File("/foo/bar/gav"), File("/foo/bar/").resolve("gav"))
assertEquals(File("/gav"), File("/foo/bar").resolve("/gav"))
@@ -322,7 +322,7 @@ class FilesTest {
// assertEquals(File("foo/bar"), File("foo").resolve("./bar"))
}
@test fun resolveSibling() {
@Test fun resolveSibling() {
assertEquals(File("/foo/gav"), File("/foo/bar").resolveSibling("gav"))
assertEquals(File("/foo/gav"), File("/foo/bar/").resolveSibling("gav"))
assertEquals(File("/gav"), File("/foo/bar").resolveSibling("/gav"))
@@ -337,7 +337,7 @@ class FilesTest {
assertEquals(File("../gav"), File("").resolveSibling("gav"))
}
@test fun extension() {
@Test fun extension() {
assertEquals("bbb", File("aaa.bbb").extension)
assertEquals("", File("aaa").extension)
assertEquals("", File("aaa.").extension)
@@ -346,7 +346,7 @@ class FilesTest {
assertEquals("", File("/my.dir/log").extension)
}
@test fun nameWithoutExtension() {
@Test fun nameWithoutExtension() {
assertEquals("aaa", File("aaa.bbb").nameWithoutExtension)
assertEquals("aaa", File("aaa").nameWithoutExtension)
assertEquals("aaa", File("aaa.").nameWithoutExtension)
@@ -354,7 +354,7 @@ class FilesTest {
assertEquals("log", File("/my.dir/log").nameWithoutExtension)
}
@test fun testCopyTo() {
@Test fun testCopyTo() {
val srcFile = createTempFile()
val dstFile = createTempFile()
try {
@@ -419,7 +419,7 @@ class FilesTest {
}
}
@test fun copyToNameWithoutParent() {
@Test fun copyToNameWithoutParent() {
val currentDir = File("").absoluteFile!!
val srcFile = createTempFile()
val dstFile = createTempFile(directory = currentDir)
@@ -439,7 +439,7 @@ class FilesTest {
}
}
@test fun deleteRecursively() {
@Test fun deleteRecursively() {
val dir = createTempDir()
dir.delete()
dir.mkdir()
@@ -453,7 +453,7 @@ class FilesTest {
assertTrue(dir.deleteRecursively())
}
@test fun deleteRecursivelyWithFail() {
@Test fun deleteRecursivelyWithFail() {
val basedir = FileTreeWalkTest.createTestFiles()
val restricted = File(basedir, "1")
try {
@@ -491,7 +491,7 @@ class FilesTest {
}
}
@test fun copyRecursively() {
@Test fun copyRecursively() {
val src = createTempDir()
val dst = createTempDir()
dst.delete()
@@ -562,7 +562,7 @@ class FilesTest {
}
}
@test fun copyRecursivelyWithOverwrite() {
@Test fun copyRecursivelyWithOverwrite() {
val src = createTempDir()
val dst = createTempDir()
fun check() = compareDirectories(src, dst)
@@ -596,7 +596,7 @@ class FilesTest {
}
}
@test fun helpers1() {
@Test fun helpers1() {
val str = "123456789\n"
System.setIn(str.byteInputStream())
val reader = System.`in`.bufferedReader()
@@ -607,7 +607,7 @@ class FilesTest {
assertEquals('3', stringReader.read().toChar())
}
@test fun helpers2() {
@Test fun helpers2() {
val file = createTempFile()
val writer = file.printWriter()
val str1 = "Hello, world!"
libraries/stdlib/test/io/IOStreams.kt
+3 -3
View File
@@ -1,13 +1,13 @@
@file:kotlin.jvm.JvmVersion
package test.io
import org.junit.Test as test
import org.junit.Test
import kotlin.test.*
import java.io.Writer
import java.io.BufferedReader
class IOStreamsTest {
@test fun testGetStreamOfFile() {
@Test fun testGetStreamOfFile() {
val tmpFile = createTempFile()
var writer: Writer? = null
try {
@@ -27,7 +27,7 @@ class IOStreamsTest {
assertEquals("Hello, World!", act)
}
@test fun testInputStreamIterator() {
@Test fun testInputStreamIterator() {
val x = ByteArray(10) { it.toByte() }
val result = mutableListOf<Byte>()
libraries/stdlib/test/io/ReadWrite.kt
+10 -10
View File
@@ -1,7 +1,7 @@
@file:kotlin.jvm.JvmVersion
package test.io
import org.junit.Test as test
import org.junit.Test
import java.io.File
import kotlin.test.assertEquals
import java.io.Reader
@@ -14,7 +14,7 @@ import kotlin.test.assertTrue
fun sample(): Reader = StringReader("Hello\nWorld");
class ReadWriteTest {
@test fun testAppendText() {
@Test fun testAppendText() {
val file = File.createTempFile("temp", System.nanoTime().toString())
file.writeText("Hello\n")
file.appendText("World\n")
@@ -25,7 +25,7 @@ class ReadWriteTest {
file.deleteOnExit()
}
@test fun reader() {
@Test fun reader() {
val list = ArrayList<String>()
/* TODO would be nicer maybe to write this as
@@ -71,7 +71,7 @@ class ReadWriteTest {
assertEquals(2, c)
}
@test fun file() {
@Test fun file() {
val file = File.createTempFile("temp", System.nanoTime().toString())
val writer = file.outputStream().writer().buffered()
@@ -125,7 +125,7 @@ class ReadWriteTest {
@test fun testUse() {
@Test fun testUse() {
val list = ArrayList<String>()
val reader = sample().buffered()
@@ -142,7 +142,7 @@ class ReadWriteTest {
assertEquals(arrayListOf("Hello", "World"), list)
}
@test fun testPlatformNullUse() {
@Test fun testPlatformNullUse() {
fun <T> platformNull() = java.util.Collections.singleton(null as T).first()
val resource = platformNull<java.io.Closeable>()
val result = resource.use {
@@ -151,7 +151,7 @@ class ReadWriteTest {
assertEquals("ok", result)
}
@test fun testURL() {
@Test fun testURL() {
val url = URL("http://kotlinlang.org")
val text = url.readText()
assertFalse(text.isEmpty())
@@ -162,7 +162,7 @@ class ReadWriteTest {
class LineIteratorTest {
@test fun useLines() {
@Test fun useLines() {
// TODO we should maybe zap the useLines approach as it encourages
// use of iterators which don't close the underlying stream
val list1 = sample().useLines { it.toList() }
@@ -172,7 +172,7 @@ class LineIteratorTest {
assertEquals(listOf("Hello", "World"), list2)
}
@test fun manualClose() {
@Test fun manualClose() {
val reader = sample().buffered()
try {
val list = reader.lineSequence().toList()
@@ -182,7 +182,7 @@ class LineIteratorTest {
}
}
@test fun boundaryConditions() {
@Test fun boundaryConditions() {
var reader = StringReader("").buffered()
assertEquals(emptyList(), reader.lineSequence().toList())
reader.close()