From 5e85c8650f81cb834f964a4920eaf4ebc4ab571a Mon Sep 17 00:00:00 2001 From: Adam <152864218+adam-enko@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:52:30 +0200 Subject: [PATCH] Fix failing assertion in DokkaPluginFunctionalTest (#3801) follow up #3796 --- .../kotlin/DokkaPluginFunctionalTest.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/DokkaPluginFunctionalTest.kt b/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/DokkaPluginFunctionalTest.kt index 3ee5ca6338..eb51e9d7b2 100644 --- a/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/DokkaPluginFunctionalTest.kt +++ b/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/DokkaPluginFunctionalTest.kt @@ -144,6 +144,18 @@ class DokkaPluginFunctionalTest : FunSpec({ configurationsDump .filter { (k, v) -> "$k=$v".contains("dokka", ignoreCase = true) } .asClue { dokkaConfigurations -> + + dokkaConfigurations.keys.shouldContainExactlyInAnyOrder( + expectedFormats.flatMap { format -> + listOf( + "Configuration dokka${format}GeneratorRuntimeResolver~internal", + "Configuration dokka${format}ModuleOutputDirectoriesResolver~internal", + "Configuration dokka${format}PluginIntransitiveResolver~internal", + "Configuration dokka${format}PublicationPluginResolver~internal", + ) + } + ) + expectedFormats.forEach { expectedFormat -> val format = expectedFormat.lowercase() @@ -151,15 +163,6 @@ class DokkaPluginFunctionalTest : FunSpec({ @Suppress("LocalVariableName") val Format = format.uppercaseFirstChar() - dokkaConfigurations.keys.shouldContainExactlyInAnyOrder( - listOf( - "Configuration dokka${Format}GeneratorRuntimeResolver~internal", - "Configuration dokka${Format}ModuleOutputDirectoriesResolver~internal", - "Configuration dokka${Format}PluginIntransitiveResolver~internal", - "Configuration dokka${Format}PublicationPluginResolver~internal", - ) - ) - mapOf( "Configuration dokka${Format}GeneratorRuntimeResolver~internal" to /* language=text */ """ |[Internal Dokka Configuration] Dokka Generator runtime classpath for $format - will be used in Dokka Worker. Should contain all transitive dependencies, plugins (and their transitive dependencies), so Dokka Worker can run.