@@ -7,6 +7,8 @@ package test.io
7
7
8
8
import test.assertArrayContentEquals
9
9
import java.io.*
10
+ import kotlin.io.path.createTempDirectory
11
+ import kotlin.io.path.createTempFile
10
12
import kotlin.io.walkTopDown
11
13
import kotlin.random.Random
12
14
import kotlin.test.*
@@ -17,14 +19,13 @@ class FilesTest {
17
19
private val isBackslashSeparator = File .separatorChar == ' \\ '
18
20
19
21
20
- @Suppress(" DEPRECATION" )
21
22
@Test fun testPath () {
22
23
val fileSuf = System .currentTimeMillis().toString()
23
- val file1 = createTempFile(" temp" , fileSuf)
24
+ val file1 = createTempFile(" temp" , fileSuf).toFile()
24
25
assertTrue(file1.path.endsWith(fileSuf), file1.path)
25
26
}
26
27
27
- @Suppress(" DEPRECATION " )
28
+ @Suppress(" DEPRECATION_ERROR " )
28
29
@Test fun testCreateTempDir () {
29
30
val dirSuf = System .currentTimeMillis().toString()
30
31
val dir1 = createTempDir(" temp" , dirSuf)
@@ -44,39 +45,38 @@ class FilesTest {
44
45
dir3.delete()
45
46
}
46
47
47
- @Suppress(" DEPRECATION " )
48
+ @Suppress(" DEPRECATION_ERROR " )
48
49
@Test fun testCreateTempFile () {
49
50
val fileSuf = System .currentTimeMillis().toString()
50
- val file1 = createTempFile(" temp" , fileSuf)
51
+ val file1 = kotlin.io. createTempFile(" temp" , fileSuf)
51
52
assertTrue(file1.exists() && file1.name.startsWith(" temp" ) && file1.name.endsWith(fileSuf))
52
53
assertFailsWith(IllegalArgumentException ::class ) {
53
- createTempFile(" a" )
54
+ kotlin.io. createTempFile(" a" )
54
55
}
55
56
56
- val file2 = createTempFile(" temp" )
57
+ val file2 = kotlin.io. createTempFile(" temp" )
57
58
assertTrue(file2.exists() && file2.name.startsWith(" temp" ) && file2.name.endsWith(" .tmp" ))
58
59
59
- val file3 = createTempFile()
60
+ val file3 = kotlin.io. createTempFile()
60
61
assertTrue(file3.exists() && file3.name.startsWith(" tmp" ) && file3.name.endsWith(" .tmp" ))
61
62
62
63
file1.delete()
63
64
file2.delete()
64
65
file3.delete()
65
66
}
66
67
67
- @Suppress(" DEPRECATION" )
68
68
@Test fun listFilesWithFilter () {
69
- val dir = createTempDir (" temp" )
69
+ val dir = createTempDirectory (" temp" )
70
70
71
- createTempFile(" temp1" , " .kt" , dir)
72
- createTempFile(" temp2" , " .java" , dir)
73
- createTempFile(" temp3" , " .kt" , dir)
71
+ createTempFile(prefix = " temp1" , suffix = " .kt" , directory = dir)
72
+ createTempFile(prefix = " temp2" , suffix = " .java" , directory = dir)
73
+ createTempFile(prefix = " temp3" , suffix = " .kt" , directory = dir)
74
74
75
75
// This line works only with Kotlin File.listFiles(filter)
76
- val result = dir.listFiles { it -> it.name.endsWith(" .kt" ) } // todo ambiguity on SAM
76
+ val result = dir.toFile(). listFiles { it -> it.name.endsWith(" .kt" ) } // todo ambiguity on SAM
77
77
assertEquals(2 , result!! .size)
78
78
// This line works both with Kotlin File.listFiles(filter) and the same Java function because of SAM
79
- val result2 = dir.listFiles { it -> it.name.endsWith(" .kt" ) }
79
+ val result2 = dir.toFile(). listFiles { it -> it.name.endsWith(" .kt" ) }
80
80
assertEquals(2 , result2!! .size)
81
81
}
82
82
@@ -370,7 +370,7 @@ class FilesTest {
370
370
}
371
371
372
372
@Test fun writeReadText () {
373
- val file = @Suppress( " DEPRECATION " ) createTempFile ()
373
+ val file = createTempFile().toFile ()
374
374
try {
375
375
val expected = String (CharArray (DEFAULT_BUFFER_SIZE * 2 ) { Random .nextInt(0 , 1024 ).toChar() })
376
376
file.writeText(expected)
@@ -395,7 +395,7 @@ class FilesTest {
395
395
}
396
396
397
397
@Test fun writeReadBytes () {
398
- val file = @Suppress( " DEPRECATION " ) createTempFile ()
398
+ val file = createTempFile().toFile ()
399
399
try {
400
400
val expected = Random .nextBytes(DEFAULT_BUFFER_SIZE * 4 )
401
401
file.writeBytes(expected)
@@ -431,8 +431,8 @@ class FilesTest {
431
431
}
432
432
433
433
@Test fun testCopyTo () {
434
- val srcFile = @Suppress( " DEPRECATION " ) createTempFile ()
435
- val dstFile = @Suppress( " DEPRECATION " ) createTempFile ()
434
+ val srcFile = createTempFile().toFile ()
435
+ val dstFile = createTempFile().toFile ()
436
436
try {
437
437
srcFile.writeText(" Hello, World!" )
438
438
assertFailsWith(FileAlreadyExistsException ::class , " copy do not overwrite existing file" ) {
@@ -497,8 +497,8 @@ class FilesTest {
497
497
498
498
@Test fun copyToNameWithoutParent () {
499
499
val currentDir = File (" " ).absoluteFile!!
500
- val srcFile = @Suppress( " DEPRECATION " ) createTempFile ()
501
- val dstFile = @Suppress( " DEPRECATION " ) createTempFile(directory = currentDir)
500
+ val srcFile = createTempFile().toFile ()
501
+ val dstFile = createTempFile(directory = currentDir.toPath()).toFile( )
502
502
try {
503
503
srcFile.writeText(" Hello, World!" , Charsets .UTF_8 )
504
504
dstFile.delete()
@@ -516,7 +516,7 @@ class FilesTest {
516
516
}
517
517
518
518
@Test fun deleteRecursively () {
519
- val dir = @Suppress( " DEPRECATION " ) createTempDir ()
519
+ val dir = createTempDirectory().toFile ()
520
520
dir.delete()
521
521
dir.mkdir()
522
522
val subDir = File (dir, " subdir" );
@@ -567,22 +567,22 @@ class FilesTest {
567
567
}
568
568
}
569
569
570
- @Suppress(" DEPRECATION" )
571
570
@Test fun copyRecursively () {
572
- val src = createTempDir()
573
- val dst = createTempDir()
571
+ val srcPath = createTempDirectory()
572
+ val src = srcPath.toFile()
573
+ val dst = createTempDirectory().toFile()
574
574
dst.delete()
575
575
fun check () = compareDirectories(src, dst)
576
576
577
577
try {
578
- val subDir1 = createTempDir (prefix = " d1_" , directory = src )
579
- val subDir2 = createTempDir (prefix = " d2_" , directory = src )
580
- createTempDir (prefix = " d1_" , directory = subDir1)
581
- val file1 = createTempFile(prefix = " f1_" , directory = src )
582
- val file2 = createTempFile(prefix = " f2_" , directory = subDir1)
578
+ val subDir1 = createTempDirectory (prefix = " d1_" , directory = srcPath )
579
+ val subDir2 = createTempDirectory (prefix = " d2_" , directory = srcPath )
580
+ createTempDirectory (prefix = " d1_" , directory = subDir1)
581
+ val file1 = createTempFile(prefix = " f1_" , directory = srcPath).toFile( )
582
+ val file2 = createTempFile(prefix = " f2_" , directory = subDir1).toFile()
583
583
file1.writeText(" hello" )
584
584
file2.writeText(" wazzup" )
585
- createTempDir (prefix = " d1_" , directory = subDir2)
585
+ createTempDirectory (prefix = " d1_" , directory = subDir2)
586
586
587
587
assertTrue(src.copyRecursively(dst))
588
588
check()
@@ -602,7 +602,7 @@ class FilesTest {
602
602
}
603
603
assertEquals(2 , conflicts)
604
604
605
- if (subDir1.setReadable(false )) {
605
+ if (subDir1.toFile(). setReadable(false )) {
606
606
try {
607
607
dst.deleteRecursively()
608
608
var caught = false
@@ -617,7 +617,7 @@ class FilesTest {
617
617
assertTrue(caught)
618
618
check()
619
619
} finally {
620
- subDir1.setReadable(true )
620
+ subDir1.toFile(). setReadable(true )
621
621
}
622
622
}
623
623
@@ -634,10 +634,9 @@ class FilesTest {
634
634
}
635
635
}
636
636
637
- @Suppress(" DEPRECATION" )
638
637
@Test fun copyRecursivelyWithOverwrite () {
639
- val src = createTempDir ()
640
- val dst = createTempDir ()
638
+ val src = createTempDirectory().toFile ()
639
+ val dst = createTempDirectory().toFile ()
641
640
fun check () = compareDirectories(src, dst)
642
641
643
642
try {
@@ -681,7 +680,7 @@ class FilesTest {
681
680
}
682
681
683
682
@Test fun helpers2 () {
684
- val file = @Suppress( " DEPRECATION " ) createTempFile ()
683
+ val file = createTempFile().toFile ()
685
684
val writer = file.printWriter()
686
685
val str1 = " Hello, world!"
687
686
val str2 = " Everything is wonderful!"
0 commit comments