erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-30 09:58:12 -07:00
Code Releases Activity

Fix inclusion bug.

Browse source
This commit is contained in:
Cedric Beust 2016-02-19 02:01:40 +04:00
parent a574bc1adf
commit 2f386a622d
6 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/test/kotlin/com/beust/kobalt/IncludeExcludeTest.kt
View file

@ -13,6 +13,7 @@ import java.nio.file.Files
class IncludeExcludeTest : KobaltTest() {
private lateinit var topDirectory: File
private lateinit var directory: File
private lateinit var htmlDir: File
val A1 = "A1.class"
val B1 = "B1.class"
@ -20,6 +21,7 @@ class IncludeExcludeTest : KobaltTest() {
val C1 = "C1.class"
val C2 = "C2.class"
val C3 = "C3.class"
val A_HTML = "a.html"
@BeforeClass
fun bc() {
@ -29,26 +31,43 @@ class IncludeExcludeTest : KobaltTest() {
listOf(A1, B1, B2, C1, C2, C3).forEach {
File(directory, it).createNewFile()
}
htmlDir = Files.createTempDirectory("kobaltTest-").toFile()
htmlDir.mkdirs()
File(htmlDir, A_HTML).createNewFile()
}
@Test
fun html() {
val inc = IncludedFile(From(""), To(""), listOf(IFileSpec.GlobSpec("**html")))
val files = inc.allFromFiles(htmlDir.path)
println("Files " + files)
Assert.assertEquals(files.size, 1)
Assert.assertEquals(files[0].path, A_HTML)
}
@DataProvider
fun dp() : Array<Array<out Any?>> = arrayOf(
arrayOf(directory, listOf("A**class", "B**class"), listOf<String>(), listOf(A1, B1, B2)),
arrayOf(directory, listOf("A**class", "B**class"), listOf("B*class"), listOf(A1)),
arrayOf(directory, listOf("*class"), listOf("B*class"), listOf(A1, C1, C2, C3)),
arrayOf(directory, listOf("**A**class", "**B**class"), listOf<String>(), listOf(A1, B1, B2)),
arrayOf(directory, listOf("**A**class", "**B**class"), listOf("**B*class"), listOf(A1)),
arrayOf(directory, listOf("**class"), listOf("**B*class"), listOf(A1, C1, C2, C3)),
arrayOf(topDirectory, listOf("**/*class"), listOf<String>(), listOf(A1, B1, B2, C1, C2, C3)),
arrayOf(topDirectory, listOf("*class"), listOf<String>(), listOf<String>()),
arrayOf(topDirectory, listOf("**/B*class"), listOf<String>(), listOf(B1, B2)),
arrayOf(topDirectory, listOf("**/A*class", "**/B*class"), listOf("B*class"),
arrayOf(topDirectory, listOf("**A*class", "**B*class"), listOf("**C*class"),
listOf(A1, B1, B2)),
arrayOf(topDirectory, listOf("**/A*class", "**/B*class"), listOf("**/B*class"),
arrayOf(topDirectory, listOf("**A*class", "**B*class"), listOf("**B*class"),
listOf(A1))
)
@Test(dataProvider = "dp")
fun shouldInclude(root: File, includedSpec: List<String>, excludedSpec: List<String>, expectedFiles: List<String>) {
fun shouldInclude(root: File, includedSpec: List<String>, excludedSpec: List<String>, expectedFiles:
List<String>) {
val g = IFileSpec.GlobSpec(includedSpec)
val files = g.toFiles("", root.path, excludedSpec.map { Glob(it) })
val files = g.toFiles(null, root.path, excludedSpec.map { Glob(it) })
// if (files.map { it.name } != expectedFiles) {
// println("FAILURE")
// }
Assert.assertEquals(files.map { it.name }, expectedFiles)
}

2
src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt
View file

@ -13,7 +13,7 @@ import java.util.jar.JarInputStream
class VerifyKobaltZipTest : KobaltTest() {
private fun verifyMainJarFile(ins: InputStream) {
assertExistsInJarInputStream(JarInputStream(ins), "com/beust/kobalt/MainKt.class", "templates/plugin.jar")
assertExistsInJarInputStream(JarInputStream(ins), "com/beust/kobalt/MainKt.class", "templates/kobaltPlugin.jar")
}
@Test
fun verifySourceJarFile() {