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

Fix Windows tests.

Browse source
This commit is contained in:
Cedric Beust 2017-04-14 07:07:17 -07:00
parent 5ddc370521
commit 8bd098c458
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/test/kotlin/com/beust/kobalt/BaseTest.kt
View file

@ -100,15 +100,13 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) {
val projectName = "p" + Math.abs(Random().nextInt()) val projectName = "p" + Math.abs(Random().nextInt())
val version = "1.0" val version = "1.0"
fun createFile(root: File, f: String, text: String) : File { fun createFile(root: File, f: String, text: String) = File(root, f).apply {
val file = File(root, f) parentFile.mkdirs()
file.parentFile.mkdirs() writeText(text)
file.writeText(text)
return file
} }
createFile(root, "kobalt/src/Build.kt", createFile(root, "kobalt/src/Build.kt",
projectInfo.buildFile.text(root.absolutePath, projectName, version)) projectInfo.buildFile.text(KFiles.fixSlashes(root.absolutePath), projectName, version))
projectInfo.files.forEach { projectInfo.files.forEach {
createFile(root, it.path, it.content) createFile(root, it.path, it.content)
@ -125,7 +123,7 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) {
val main = Kobalt.INJECTOR.getInstance(Main::class.java) val main = Kobalt.INJECTOR.getInstance(Main::class.java)
val args = Args() val args = Args()
val jc = JCommander(args).apply { parse(*commandLine) } val jc = JCommander(args).apply { parse(*commandLine) }
args.buildFile = project.file.absolutePath + "/kobalt/src/Build.kt" args.buildFile = KFiles.fixSlashes(project.file.absolutePath) + "/kobalt/src/Build.kt"
val result = Main.launchMain(main, jc, args, arrayOf("assemble")) val result = Main.launchMain(main, jc, args, arrayOf("assemble"))
return LaunchProjectResult(projectInfo, project, result) return LaunchProjectResult(projectInfo, project, result)
} }