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

Rewrote nonLiteralFilenameFilter and filenameFilter tests without working with FS.

Browse Source 
Removed filenameFilter test from excludes for AndroidTests.
This commit is contained in:
Zalim Bashorov
2013-04-02 22:10:01 +04:00
parent 1ddf074052
commit a665fa2049
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
-2
View File
@@ -71,8 +71,6 @@ public class SpecialFiles {
excludedFiles.add("kt529.kt"); // Bug
excludedFiles.add("kt344.kt"); // Bug
excludedFiles.add("filenameFilter.kt"); // Work with FileSystem
excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: jet.Nothing
}
compiler/testData/codegen/box/sam/filenameFilter.kt
+9 -5
View File
@@ -1,9 +1,13 @@
import java.io.*
fun box(): String {
val filter = FilenameFilter { dir, name -> if (name == null) false else (name as java.lang.String).endsWith(".md") }
val listFiles = File(".").listFiles(filter)!!
if (listFiles.size != 1) return "Wrong size: $listFiles.size"
val name = listFiles[0].getName()
return if (name == "ReadMe.md") "OK" else "Wrong name: $name"
val ACCEPT_NAME = "test"
val WRONG_NAME = "wrong"
val filter = FileFilter { file -> ACCEPT_NAME == file?.getName() }
if (!filter.accept(File(ACCEPT_NAME))) return "Wrong answer for $ACCEPT_NAME"
if (filter.accept(File(WRONG_NAME))) return "Wrong answer for $WRONG_NAME"
return "OK"
}
compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt
+10 -6
View File
@@ -1,10 +1,14 @@
import java.io.*
fun box(): String {
val f : (File?, String?) -> Boolean = { dir, name -> if (name == null) false else (name as java.lang.String).endsWith(".md") }
val filter = FilenameFilter(f)
val listFiles = File(".").listFiles(filter)!!
if (listFiles.size != 1) return "Wrong size: $listFiles.size"
val name = listFiles[0].getName()
return if (name == "ReadMe.md") "OK" else "Wrong name: $name"
val ACCEPT_NAME = "test"
val WRONG_NAME = "wrong"
val f : (File?) -> Boolean = { file -> ACCEPT_NAME == file?.getName() }
val filter = FileFilter(f)
if (!filter.accept(File(ACCEPT_NAME))) return "Wrong answer for $ACCEPT_NAME"
if (filter.accept(File(WRONG_NAME))) return "Wrong answer for $WRONG_NAME"
return "OK"
}