From 56d1261a5ae34d3ec6fbb2f6b65a61641b3db106 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Wed, 18 May 2022 22:24:39 +1000 Subject: [PATCH] Fix some tests on Windows --- .../jetbrains/dokka/it/cli/CliIntegrationTest.kt | 14 ++++++++------ .../gradle/projects/it-basic/build.gradle.kts | 2 +- .../gradle/AbstractGradleCachingIntegrationTest.kt | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt index b94df32a31..424c229cbe 100644 --- a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt +++ b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt @@ -267,9 +267,10 @@ class CliIntegrationTest : AbstractCliIntegrationTest() { fun `should accept json as input configuration`() { val dokkaOutputDir = File(projectDir, "output") assertTrue(dokkaOutputDir.mkdirs()) - val jsonPath = javaClass.getResource("/my-file.json")?.path ?: throw IllegalStateException("No JSON found!") + val resourcePath = javaClass.getResource("/my-file.json")?.toURI() ?: throw IllegalStateException("No JSON found!") + val jsonPath = File(resourcePath).absolutePath PrintWriter(jsonPath).run { - write(jsonBuilder(dokkaOutputDir.path, basePluginJarFile.path, File(projectDir, "src").path, reportUndocumented = true)) + write(jsonBuilder(dokkaOutputDir.invariantSeparatorsPath, basePluginJarFile.invariantSeparatorsPath, File(projectDir, "src").invariantSeparatorsPath, reportUndocumented = true)) close() } @@ -306,13 +307,14 @@ class CliIntegrationTest : AbstractCliIntegrationTest() { fun `global settings should overwrite package options in configuration`() { val dokkaOutputDir = File(projectDir, "output") assertTrue(dokkaOutputDir.mkdirs()) - val jsonPath = javaClass.getResource("/my-file.json")?.path ?: throw IllegalStateException("No JSON found!") + val resourcePath = javaClass.getResource("/my-file.json")?.toURI() ?: throw IllegalStateException("No JSON found!") + val jsonPath = File(resourcePath).absolutePath PrintWriter(jsonPath).run { write( jsonBuilder( - outputPath = dokkaOutputDir.path, - pluginsClasspath = basePluginJarFile.path, - projectPath = File(projectDir, "src").path, + outputPath = dokkaOutputDir.invariantSeparatorsPath, + pluginsClasspath = basePluginJarFile.invariantSeparatorsPath, + projectPath = File(projectDir, "src").invariantSeparatorsPath, globalSourceLinks = """ { "localDirectory": "/home/Vadim.Mishenev/dokka/examples/cli/src/main/kotlin", diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index 5adefda99f..b2a84e5f99 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -60,5 +60,5 @@ tasks.withType { } suppressObviousFunctions.set(false) - pluginsMapConfiguration.set(mapOf(DokkaBase::class.qualifiedName to """{ "customStyleSheets": ["${file("../customResources/logo-styles.css")}", "${file("../customResources/custom-style-to-add.css")}"], "customAssets" : ["${file("../customResources/custom-resource.svg")}"] }""")) + pluginsMapConfiguration.set(mapOf(DokkaBase::class.qualifiedName to """{ "customStyleSheets": ["${file("../customResources/logo-styles.css").invariantSeparatorsPath}", "${file("../customResources/custom-style-to-add.css").invariantSeparatorsPath}"], "customAssets" : ["${file("../customResources/custom-resource.svg").invariantSeparatorsPath}"] }""")) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt index 2bce02aa08..539941e0ef 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt @@ -29,7 +29,7 @@ abstract class AbstractGradleCachingIntegrationTest(override val versions: Build buildCache { local { // Set local build cache directory. - directory = File("${projectDir.absolutePath}", "build-cache") + directory = File("${projectDir.invariantSeparatorsPath}", "build-cache") } } """.trimIndent() @@ -40,7 +40,7 @@ abstract class AbstractGradleCachingIntegrationTest(override val versions: Build buildCache { local { // Set local build cache directory. - directory = File("${projectDir.absolutePath}", "build-cache") + directory = File("${projectDir.invariantSeparatorsPath}", "build-cache") } } """.trimIndent()