Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some tests on Windows #2507

Merged
merged 1 commit into from May 26, 2022
Merged

Fix some tests on Windows #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...ion-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt
View file
Open in desktop
Expand Up @@ -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()
}

Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-basic/build.gradle.kts
View file
Open in desktop
Expand Up @@ -60,5 +60,5 @@ tasks.withType<DokkaTask> {
}
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}"] }"""))
}
4 changes: 2 additions & 2 deletions ...egrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt
View file
Open in desktop
Expand Up @@ -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()
Expand All @@ -40,7 +40,7 @@ abstract class AbstractGradleCachingIntegrationTest(override val versions: Build
buildCache {
local<DirectoryBuildCache> {
// Set local build cache directory.
directory = File("${projectDir.absolutePath}", "build-cache")
directory = File("${projectDir.invariantSeparatorsPath}", "build-cache")
}
}
""".trimIndent()
Expand Down