diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt index 5ca324187f..f097807b65 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt @@ -36,16 +36,16 @@ class JsIRGradleIntegrationTest : AbstractGradleIntegrationTest() { File(templateProjectDir, "src").copyRecursively(File(projectDir, "src")) } - @ParameterizedTest(name = "{0} {1}") - @ArgumentsSource(AllSupportedTestedVersionsWithK2SwitcherArgumentsProvider::class) - fun execute(buildVersions: BuildVersions, extraParameter: String) { + @ParameterizedTest(name = "{0}") + @ArgumentsSource(AllSupportedTestedVersionsArgumentsProvider::class) + fun execute(buildVersions: BuildVersions) { if (ignoredKotlinVersions.contains(buildVersions.kotlinVersion)) { return } val reactVersion = TestedVersions.KT_REACT_WRAPPER_MAPPING[buildVersions.kotlinVersion] ?: throw IllegalStateException("Unspecified version of react for kotlin " + buildVersions.kotlinVersion) - val result = createGradleRunner(buildVersions, "-Preact_version=$reactVersion", "dokkaHtml", "-i", "-s", extraParameter).buildRelaxed() + val result = createGradleRunner(buildVersions, "-Preact_version=$reactVersion", "dokkaHtml", "-i", "-s").buildRelaxed() assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtml")).outcome) val htmlOutputDir = File(projectDir, "build/dokka/html") diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt index f890c4867a..a5538f5e5c 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt @@ -24,9 +24,9 @@ class Multiplatform0GradleIntegrationTest : AbstractGradleIntegrationTest() { File(templateProjectDir, "src").copyRecursively(File(projectDir, "src")) } - @ParameterizedTest(name = "{0} {1}") - @ArgumentsSource(AllSupportedTestedVersionsWithK2SwitcherArgumentsProvider::class) - fun execute(buildVersions: BuildVersions, extraParameter: String) { + @ParameterizedTest(name = "{0}") + @ArgumentsSource(AllSupportedTestedVersionsArgumentsProvider::class) + fun execute(buildVersions: BuildVersions) { // `enableGranularSourceSetsMetadata` and `enableDependencyPropagation` flags are enabled by default since 1.6.20. // remove when this test is executed with Kotlin >= 1.6.20 val result = if (buildVersions.kotlinVersion < "1.6.20") @@ -37,10 +37,9 @@ class Multiplatform0GradleIntegrationTest : AbstractGradleIntegrationTest() { "-s", "-Pkotlin.mpp.enableGranularSourceSetsMetadata=true", "-Pkotlin.native.enableDependencyPropagation=false", - extraParameter ).buildRelaxed() else - createGradleRunner(buildVersions, "dokkaHtml", "-i", "-s", extraParameter).buildRelaxed() + createGradleRunner(buildVersions, "dokkaHtml", "-i", "-s").buildRelaxed() assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtml")).outcome) diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt index bb63c532ac..884656b01a 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt @@ -9,7 +9,7 @@ import org.jetbrains.dokka.it.TestOutputCopier import org.jetbrains.dokka.it.copyAndApplyGitDiff import org.jetbrains.dokka.it.gradle.AbstractGradleIntegrationTest import org.jetbrains.dokka.it.gradle.BuildVersions -import org.jetbrains.dokka.it.gradle.TestedVersionsWithK2SwitcherArgumentsProvider +import org.jetbrains.dokka.it.gradle.TestedVersionsArgumentsProvider import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ArgumentsSource import java.io.File @@ -24,7 +24,7 @@ private val buildVersions = BuildVersions.permutations( ) internal class CoroutinesBuildVersionsArgumentsProvider : - TestedVersionsWithK2SwitcherArgumentsProvider(buildVersions) + TestedVersionsArgumentsProvider(buildVersions) class CoroutinesGradleIntegrationTest : AbstractGradleIntegrationTest(), TestOutputCopier { override val projectOutputLocation: File by lazy { File(projectDir, "build/dokka/htmlMultiModule") } @@ -38,12 +38,12 @@ class CoroutinesGradleIntegrationTest : AbstractGradleIntegrationTest(), TestOut copyAndApplyGitDiff(File("projects", "coroutines/coroutines.diff")) } - @ParameterizedTest(name = "{0} {1}") + @ParameterizedTest(name = "{0}") @ArgumentsSource(CoroutinesBuildVersionsArgumentsProvider::class) - fun execute(buildVersions: BuildVersions, extraParameter: String) { + fun execute(buildVersions: BuildVersions) { val result = createGradleRunner( buildVersions, - ":dokkaHtmlMultiModule", "-i", "-s", extraParameter, + ":dokkaHtmlMultiModule", "-i", "-s", jvmArgs = listOf("-Xmx2G", "-XX:MaxMetaspaceSize=500m") ).buildRelaxed() diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt index 35d8f63f9b..d480046b10 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt @@ -9,7 +9,7 @@ import org.jetbrains.dokka.it.TestOutputCopier import org.jetbrains.dokka.it.copyAndApplyGitDiff import org.jetbrains.dokka.it.gradle.AbstractGradleIntegrationTest import org.jetbrains.dokka.it.gradle.BuildVersions -import org.jetbrains.dokka.it.gradle.TestedVersionsWithK2SwitcherArgumentsProvider +import org.jetbrains.dokka.it.gradle.TestedVersionsArgumentsProvider import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ArgumentsSource import java.io.File @@ -24,7 +24,7 @@ private val buildVersions = BuildVersions.permutations( ) internal class SerializationBuildVersionsArgumentsProvider : - TestedVersionsWithK2SwitcherArgumentsProvider(buildVersions) + TestedVersionsArgumentsProvider(buildVersions) class SerializationGradleIntegrationTest : AbstractGradleIntegrationTest(), TestOutputCopier { @@ -38,10 +38,10 @@ class SerializationGradleIntegrationTest : AbstractGradleIntegrationTest(), Test copyAndApplyGitDiff(File("projects", "serialization/serialization.diff")) } - @ParameterizedTest(name = "{0} {1}") + @ParameterizedTest(name = "{0}") @ArgumentsSource(SerializationBuildVersionsArgumentsProvider::class) - fun execute(buildVersions: BuildVersions, extraParameter: String) { - val result = createGradleRunner(buildVersions, ":dokkaHtmlMultiModule", "-i", "-s", extraParameter).buildRelaxed() + fun execute(buildVersions: BuildVersions) { + val result = createGradleRunner(buildVersions, ":dokkaHtmlMultiModule", "-i", "-s").buildRelaxed() assertEquals(TaskOutcome.SUCCESS, assertNotNull(result.task(":dokkaHtmlMultiModule")).outcome)