From f94417c263db96b18fe978573adcb7db39474a68 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Sat, 11 Jan 2025 03:16:59 -0500 Subject: [PATCH] Migrate to JVM Test Suite (#1141) https://docs.gradle.org/current/userguide/jvm_test_suite_plugin.html https://blog.gradle.org/introducing-test-suites --- build.gradle.kts | 134 +++++++++--------- gradle/libs.versions.toml | 2 - .../gradle/plugins/shadow/ApplicationTest.kt | 0 .../gradle/plugins/shadow/BasePluginTest.kt | 0 .../gradle/plugins/shadow/FilteringTest.kt | 0 .../gradle/plugins/shadow/PublishingTest.kt | 0 .../gradle/plugins/shadow/RelocationTest.kt | 0 .../gradle/plugins/shadow/ShadowPluginTest.kt | 0 .../plugins/shadow/caching/BaseCachingTest.kt | 0 .../shadow/caching/MinimizationCachingTest.kt | 0 .../shadow/caching/RelocationCachingTest.kt | 0 .../shadow/caching/ShadowJarCachingTest.kt | 0 .../shadow/caching/TransformCachingTest.kt | 0 .../transformers/AppendingTransformerTest.kt | 0 .../transformers/BaseTransformerTest.kt | 0 .../GroovyExtensionModuleTransformerTest.kt | 0 .../ServiceFileTransformerTest.kt | 0 .../shadow/transformers/TransformersTest.kt | 0 .../shadow/util/AppendableMavenRepository.kt | 0 .../shadow/util/GradleModuleMetadata.kt | 0 .../gradle/plugins/shadow/util/Issue.kt | 0 .../gradle/plugins/shadow/util/JarBuilder.kt | 0 .../gradle/plugins/shadow/util/JarPath.kt | 0 .../org.junit.jupiter.api.extension.Extension | 0 .../resources/junit-3.8.2.jar | Bin .../resources/test-artifact-1.0-SNAPSHOT.jar | Bin .../resources/test-project-1.0-SNAPSHOT.jar | Bin .../plugins/shadow/DocCodeSnippetTest.kt | 0 .../executable/CodeSnippetExecutable.kt | 0 .../shadow/executable/CodeSnippetExtractor.kt | 0 .../shadow/executor/GroovyBuildExecutor.kt | 0 .../plugins/shadow/executor/NoopExecutor.kt | 0 .../shadow/executor/SnippetExecutor.kt | 0 .../shadow/fixture/GroovyDslFixture.kt | 0 .../plugins/shadow/fixture/SnippetFixture.kt | 0 35 files changed, 68 insertions(+), 68 deletions(-) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/TransformCachingTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/util/GradleModuleMetadata.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/util/Issue.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt (100%) rename src/{funcTest => functionalTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarPath.kt (100%) rename src/{funcTest => functionalTest}/resources/META-INF/services/org.junit.jupiter.api.extension.Extension (100%) rename src/{funcTest => functionalTest}/resources/junit-3.8.2.jar (100%) rename src/{funcTest => functionalTest}/resources/test-artifact-1.0-SNAPSHOT.jar (100%) rename src/{funcTest => functionalTest}/resources/test-project-1.0-SNAPSHOT.jar (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt (100%) rename src/{intiTest => integrationTest}/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 03f2e1838..9fa451fde 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +@file:Suppress("UnstableApiUsage") + import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion @@ -44,26 +46,6 @@ spotless { } } -val intiTest: SourceSet by sourceSets.creating -val intiTestImplementation: Configuration by configurations.getting { - extendsFrom(configurations.testImplementation.get()) -} -val intiTestRuntimeOnly: Configuration by configurations.getting { - extendsFrom(configurations.testRuntimeOnly.get()) -} - -val funcTest: SourceSet by sourceSets.creating -val funcTestImplementation: Configuration by configurations.getting { - extendsFrom(configurations.testImplementation.get()) -} -val funcTestRuntimeOnly: Configuration by configurations.getting { - extendsFrom(configurations.testRuntimeOnly.get()) -} - -gradlePlugin { - testSourceSets.add(funcTest) -} - dependencies { implementation(libs.apache.ant) implementation(libs.apache.commonsIo) @@ -74,61 +56,81 @@ dependencies { implementation(libs.plexus.utils) implementation(libs.plexus.xml) - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) - testImplementation(libs.assertk) - testImplementation(libs.xmlunit) - testRuntimeOnly(libs.junit.platformLauncher) - - funcTestImplementation(sourceSets.main.get().output) - funcTestImplementation(libs.apache.maven.modelBuilder) - funcTestImplementation(libs.moshi) - funcTestImplementation(libs.moshi.kotlin) - lintChecks(libs.androidx.gradlePluginLints) } -val integrationTest by tasks.registering(Test::class) { - description = "Runs the integration tests." - group = LifecycleBasePlugin.VERIFICATION_GROUP - testClassesDirs = intiTest.output.classesDirs - classpath = intiTest.runtimeClasspath +testing.suites { + getByName("test") { + dependencies { + implementation(libs.xmlunit) + } + } + register("integrationTest") { + testType = TestSuiteType.INTEGRATION_TEST + targets.configureEach { + testTask { + val docsDir = file("src/docs") + // Add src/docs as an input directory to trigger ManualCodeSnippetTests re-run on changes. + inputs.dir(docsDir) + systemProperty("DOCS_DIR", docsDir.absolutePath) + } + } + } + register("functionalTest") { + testType = TestSuiteType.FUNCTIONAL_TEST + targets.configureEach { + testTask { + // Required to enable `IssueExtension` for all tests. + systemProperty("junit.jupiter.extensions.autodetection.enabled", true) + + // Required to test configuration cache in tests when using withDebug() + // https://github.com/gradle/gradle/issues/22765#issuecomment-1339427241 + jvmArgs( + "--add-opens", + "java.base/java.util=ALL-UNNAMED", + "--add-opens", + "java.base/java.util.concurrent.atomic=ALL-UNNAMED", + "--add-opens", + "java.base/java.lang.invoke=ALL-UNNAMED", + "--add-opens", + "java.base/java.net=ALL-UNNAMED", + ) + } + } + dependencies { + // Seems we can't ref project() here due to some limitations of rootProject. + implementation(sourceSets.main.get().output) + implementation(libs.apache.ant) + implementation(libs.apache.maven.modelBuilder) + implementation(libs.moshi) + implementation(libs.moshi.kotlin) + } + } - val docsDir = file("src/docs") - // Add src/docs as an input directory to trigger ManualCodeSnippetTests re-run on changes. - inputs.dir(docsDir) - systemProperty("DOCS_DIR", docsDir.absolutePath) + withType().configureEach { + useJUnitJupiter(libs.junit.bom.map { requireNotNull(it.version) }) + dependencies { + implementation(libs.assertk) + } + targets.configureEach { + testTask { + maxParallelForks = Runtime.getRuntime().availableProcessors() + } + } + } } -val functionalTest by tasks.registering(Test::class) { - description = "Runs the functional tests." - group = LifecycleBasePlugin.VERIFICATION_GROUP - testClassesDirs = funcTest.output.classesDirs - classpath = funcTest.runtimeClasspath - - // Required to enable `IssueExtension` for all tests. - systemProperty("junit.jupiter.extensions.autodetection.enabled", true) +gradlePlugin { + testSourceSets( + sourceSets["functionalTest"], + sourceSets["integrationTest"], + ) } tasks.check { - dependsOn(integrationTest, functionalTest) -} - -tasks.withType().configureEach { - useJUnitPlatform() - maxParallelForks = Runtime.getRuntime().availableProcessors() - - // Required to test configuration cache in tests when using withDebug() - // https://github.com/gradle/gradle/issues/22765#issuecomment-1339427241 - jvmArgs( - "--add-opens", - "java.base/java.util=ALL-UNNAMED", - "--add-opens", - "java.base/java.util.concurrent.atomic=ALL-UNNAMED", - "--add-opens", - "java.base/java.lang.invoke=ALL-UNNAMED", - "--add-opens", - "java.base/java.net=ALL-UNNAMED", + dependsOn( + testing.suites.named("integrationTest"), + testing.suites.named("functionalTest"), ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 478001332..c4b8bdbfe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,8 +26,6 @@ androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha03" ktlint = "com.pinterest.ktlint:ktlint-cli:1.5.0" junit-bom = "org.junit:junit-bom:5.11.4" -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" } -junit-platformLauncher = { module = "org.junit.platform:junit-platform-launcher" } assertk = "com.willowtreeapps.assertk:assertk:0.28.1" [plugins] diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/TransformCachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/TransformCachingTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/TransformCachingTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/TransformCachingTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/GradleModuleMetadata.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/GradleModuleMetadata.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/GradleModuleMetadata.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/GradleModuleMetadata.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/Issue.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/Issue.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/Issue.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/Issue.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt diff --git a/src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarPath.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarPath.kt similarity index 100% rename from src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarPath.kt rename to src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarPath.kt diff --git a/src/funcTest/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/src/functionalTest/resources/META-INF/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from src/funcTest/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to src/functionalTest/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/src/funcTest/resources/junit-3.8.2.jar b/src/functionalTest/resources/junit-3.8.2.jar similarity index 100% rename from src/funcTest/resources/junit-3.8.2.jar rename to src/functionalTest/resources/junit-3.8.2.jar diff --git a/src/funcTest/resources/test-artifact-1.0-SNAPSHOT.jar b/src/functionalTest/resources/test-artifact-1.0-SNAPSHOT.jar similarity index 100% rename from src/funcTest/resources/test-artifact-1.0-SNAPSHOT.jar rename to src/functionalTest/resources/test-artifact-1.0-SNAPSHOT.jar diff --git a/src/funcTest/resources/test-project-1.0-SNAPSHOT.jar b/src/functionalTest/resources/test-project-1.0-SNAPSHOT.jar similarity index 100% rename from src/funcTest/resources/test-project-1.0-SNAPSHOT.jar rename to src/functionalTest/resources/test-project-1.0-SNAPSHOT.jar diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt b/src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt similarity index 100% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt rename to src/integrationTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt