diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt index 48bf68dbd..e66ca1340 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt @@ -121,7 +121,7 @@ class TransformersTest : BaseTransformerTest() { } @ParameterizedTest - @MethodSource("transformerConfigurations") + @MethodSource("transformerConfigProvider") fun otherTransformers(pair: Pair>) { val (configuration, transformer) = pair if (configuration.contains("test/some.file")) { @@ -169,7 +169,7 @@ class TransformersTest : BaseTransformerTest() { """.trimIndent() @JvmStatic - fun transformerConfigurations() = listOf( + fun transformerConfigProvider() = listOf( "" to ApacheLicenseResourceTransformer::class, "" to ApacheNoticeResourceTransformer::class, "" to ComponentsXmlResourceTransformer::class, diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt index 19c082d4c..c37464df7 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt @@ -6,6 +6,7 @@ import assertk.assertions.isEqualTo import assertk.assertions.isFalse import assertk.assertions.isNotEqualTo import assertk.assertions.isTrue +import assertk.assertions.startsWith import assertk.fail import com.github.jengelman.gradle.plugins.shadow.internal.requireResourceAsStream import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator @@ -92,8 +93,8 @@ class Log4j2PluginsCacheFileTransformerTest : BaseTransformerTest, @@ -101,8 +101,8 @@ class PropertiesFileTransformerTest : BaseTransformerTest>, @@ -121,8 +121,8 @@ class PropertiesFileTransformerTest : BaseTransformerTest String, @@ -141,8 +141,8 @@ class PropertiesFileTransformerTest : BaseTransformerTest key }, diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt index 82c0eadf6..c2841d399 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt @@ -10,8 +10,8 @@ import org.junit.jupiter.params.provider.Arguments import org.junit.jupiter.params.provider.MethodSource class ServiceFileTransformerTest : BaseTransformerTest() { - @ParameterizedTest(name = "{index} => path={0}, exclude={1}, expected={2}") - @MethodSource("canTransformResourceData") + @ParameterizedTest + @MethodSource("resourceProvider") fun canTransformResource(path: String, exclude: Boolean, expected: Boolean) { if (exclude) { transformer.exclude(path) @@ -19,8 +19,8 @@ class ServiceFileTransformerTest : BaseTransformerTest() assertThat(transformer.canTransformResource(path)).isEqualTo(expected) } - @ParameterizedTest(name = "{index} => path={0}") - @MethodSource("transformsServiceFileData") + @ParameterizedTest + @MethodSource("serviceFileProvider") fun transformServiceFile(path: String, input1: String, input2: String, output: String) { if (transformer.canTransformResource(path)) { transformer.transform(context(path, input1)) @@ -44,7 +44,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() } @JvmStatic - fun canTransformResourceData() = listOf( + fun resourceProvider() = listOf( // path, exclude, expected Arguments.of("META-INF/services/java.sql.Driver", false, true), Arguments.of("META-INF/services/io.dropwizard.logging.AppenderFactory", false, true), @@ -55,7 +55,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() ) @JvmStatic - fun transformsServiceFileData() = listOf( + fun serviceFileProvider() = listOf( // path, input1, input2, output Arguments.of("META-INF/services/com.acme.Foo", "foo", "bar", "foo\nbar"), Arguments.of("META-INF/services/com.acme.Bar", "foo\nbar", "zoo", "foo\nbar\nzoo"),