From 18e61fc7a3073697184043cc274e7fac3eaba41b Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 22 Mar 2017 22:22:30 -0700 Subject: [PATCH] Fix tests for Windows. --- src/test/kotlin/com/beust/kobalt/BaseTest.kt | 6 +++++- src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt | 3 +-- .../kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/kotlin/com/beust/kobalt/BaseTest.kt b/src/test/kotlin/com/beust/kobalt/BaseTest.kt index 8967a4d7..14566168 100644 --- a/src/test/kotlin/com/beust/kobalt/BaseTest.kt +++ b/src/test/kotlin/com/beust/kobalt/BaseTest.kt @@ -86,4 +86,8 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) { return compilerFactory!!.create(listOf(thisBuildFile), pluginInfo).compileBuildFiles(args, forceRecompile = true) } -} \ No newline at end of file + + fun createTemporaryProjectDirectory() = Files.createTempDirectory("kobaltTest").toFile().path + .replace("\\", "/") + +} diff --git a/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt b/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt index a9ebb362..960e5965 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/ProfileTest.kt @@ -11,7 +11,6 @@ import org.assertj.core.api.Assertions.assertThat import org.testng.annotations.DataProvider import org.testng.annotations.Guice import org.testng.annotations.Test -import java.nio.file.Files import java.util.* @Guice(modules = arrayOf(TestModule::class)) @@ -19,7 +18,7 @@ class ProfileTest @Inject constructor(compilerFactory: BuildFileCompiler.IFactor private fun runTestWithProfile(enabled: Boolean) : Project { val projectVal = "p" + Math.abs(Random().nextInt()) - val projectDirectory = Files.createTempDirectory("kobaltTest").toFile().path + val projectDirectory = createTemporaryProjectDirectory() fun buildFileString(): String { return """ diff --git a/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt b/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt index 77cf8953..a6f0e9f3 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/DependencyManagerTest.kt @@ -13,7 +13,6 @@ import org.assertj.core.api.Assertions.assertThat import org.eclipse.aether.util.filter.AndDependencyFilter import org.testng.annotations.Guice import org.testng.annotations.Test -import java.nio.file.Files @Guice(modules = arrayOf(TestModule::class)) class DependencyManagerTest @Inject constructor(val dependencyManager: DependencyManager, @@ -107,7 +106,7 @@ class DependencyManagerTest @Inject constructor(val dependencyManager: Dependenc } private fun findDependentProject(): Project { - val projectDirectory = Files.createTempDirectory("kobaltTest").toFile().path + val projectDirectory = createTemporaryProjectDirectory() val sharedBuildFile = """ import com.beust.kobalt.*