From 16e787004303a040611eabae4c62a9a6b919d8bb Mon Sep 17 00:00:00 2001 From: vmishenev Date: Sat, 12 Feb 2022 21:31:58 +0300 Subject: [PATCH] Fix StdLib integration test --- .../gradle/projects/stdlib/stdlib.diff | 18 +++++++++++++++++- .../kotlin/StdlibGradleIntegrationTest.kt | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/integration-tests/gradle/projects/stdlib/stdlib.diff b/integration-tests/gradle/projects/stdlib/stdlib.diff index 71d27c9925..a63bbedeec 100644 --- a/integration-tests/gradle/projects/stdlib/stdlib.diff +++ b/integration-tests/gradle/projects/stdlib/stdlib.diff @@ -37,7 +37,7 @@ diff --git a/build.gradle b/build.gradle index aa8f21b..dd6a2ae 100644 --- a/build.gradle +++ b/build.gradle -@@ -1,80 +1,428 @@ +@@ -1,80 +1,444 @@ +import org.jetbrains.dokka.Platform + plugins { @@ -163,6 +163,7 @@ index aa8f21b..dd6a2ae 100644 + task dokkaStdlib(type: org.jetbrains.dokka.gradle.DokkaTask) { + outputDirectory.set(new File(outputDir, "/kotlin-stdlib")) + moduleName.set("kotlin-stdlib") ++ pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "mergeNoExpectActualDeclarations": "true" }"""]) + dokkaSourceSets { + register("kotlin-stdlib-common") { + skipDeprecated.set(false) @@ -179,6 +180,16 @@ index aa8f21b..dd6a2ae 100644 + sourceRoots.from("$kotlin_root/core/builtins/native") + sourceRoots.from("$kotlin_root/core/builtins/src") + sourceRoots.from("$kotlin_sources/kotlin-stdlib-common") ++ sourceLink { ++ localDirectory.set(file("$kotlin_sources/kotlin-stdlib-common")) ++ remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/common/src")) ++ remoteLineSuffix.set("#L") ++ } ++ sourceLink { ++ localDirectory.set(file("$kotlin_root/core/builtins/src")) ++ remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/src")) ++ remoteLineSuffix.set("#L") ++ } + } + + register("kotlin-stdlib-java-common") { @@ -220,6 +231,11 @@ index aa8f21b..dd6a2ae 100644 + matchingRegex.set("kotlin.coroutines.experimental.migration(\$|\\.).*") + suppress.set(true) + } ++ sourceLink { ++ localDirectory.set(file("$kotlin_sources/kotlin-stdlib")) ++ remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/jvm/src")) ++ remoteLineSuffix.set("#L") ++ } + } + + diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt index a5b61b1d4c..ba51a1ceb8 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt @@ -52,8 +52,8 @@ class StdlibGradleIntegrationTest(override val versions: BuildVersions) : Abstra projectOutputLocation.allHtmlFiles().forEach { file -> assertContainsNoErrorClass(file) -// assertNoUnresolvedLinks(file) -// assertNoHrefToMissingLocalFileOrDirectory(file) + assertNoUnresolvedLinks(file) + assertNoHrefToMissingLocalFileOrDirectory(file) assertNoEmptyLinks(file) assertNoEmptySpans(file) assertNoUnsubstitutedTemplatesInHtml(file)