From a60b65c670e70721a8093c0ede696dcc7cc58c43 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 28 Jan 2025 09:31:08 +0800
Subject: [PATCH 1/2] Remove extra ParameterizedTest names

They are converted from the original Spock tests, we don't need them.
---
 .../PropertiesFileTransformerTest.kt          | 20 +++++++++----------
 .../ServiceFileTransformerTest.kt             |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
index 73de42b6e..bf4a3c974 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
@@ -54,13 +54,13 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     assertThat(firstRunTargetLines).isEqualTo(secondRunTargetLines)
   }
 
-  @ParameterizedTest(name = "Path {0} {2} transformed")
+  @ParameterizedTest
   @MethodSource("pathProvider")
-  fun canTransformResourceWithPaths(path: String, expected: Boolean, transform: String) {
+  fun canTransformResourceWithPaths(path: String, expected: Boolean) {
     assertThat(transformer.canTransformResource(path)).isEqualTo(expected)
   }
 
-  @ParameterizedTest(name = "mergeStrategy={1}, mergeSeparator='{2}'")
+  @ParameterizedTest
   @MethodSource("transformConfigurationsProvider")
   fun exerciseAllTransformConfigurations(
     path: String,
@@ -81,7 +81,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     assertThat(transformer.propertiesEntries[path].orEmpty()).isEqualTo(expectedOutput)
   }
 
-  @ParameterizedTest(name = "Paths={1}")
+  @ParameterizedTest
   @MethodSource("transformConfigurationsWithPathsProvider")
   fun exerciseAllTransformConfigurationsWithPaths(
     path: String,
@@ -101,7 +101,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     assertThat(transformer.propertiesEntries[path].orEmpty()).isEqualTo(expectedOutput)
   }
 
-  @ParameterizedTest(name = "Mappings={1}")
+  @ParameterizedTest
   @MethodSource("transformConfigurationsWithMappingsProvider")
   fun exerciseAllTransformConfigurationsWithMappings(
     path: String,
@@ -121,7 +121,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     assertThat(transformer.propertiesEntries[path].orEmpty()).isEqualTo(expectedOutput)
   }
 
-  @ParameterizedTest(name = "KeyTransformer: {1}")
+  @ParameterizedTest
   @MethodSource("appliesKeyTransformerProvider")
   fun appliesKeyTransformer(
     path: String,
@@ -141,7 +141,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     assertThat(transformer.propertiesEntries[path].orEmpty()).isEqualTo(expectedOutput)
   }
 
-  @ParameterizedTest(name = "Charset: {1}")
+  @ParameterizedTest
   @MethodSource("appliesCharsetProvider")
   fun appliesCharset(
     path: String,
@@ -166,9 +166,9 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
 
     @JvmStatic
     fun pathProvider() = listOf(
-      Arguments.of("foo.properties", true, "can be"),
-      Arguments.of("foo/bar.properties", true, "can be"),
-      Arguments.of("foo.props", false, "can not be"),
+      Arguments.of("foo.properties", true),
+      Arguments.of("foo/bar.properties", true),
+      Arguments.of("foo.props", false),
     )
 
     @JvmStatic
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..39e47071a 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,7 +10,7 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 
 class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>() {
-  @ParameterizedTest(name = "{index} => path={0}, exclude={1}, expected={2}")
+  @ParameterizedTest
   @MethodSource("canTransformResourceData")
   fun canTransformResource(path: String, exclude: Boolean, expected: Boolean) {
     if (exclude) {
@@ -19,7 +19,7 @@ class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>()
     assertThat(transformer.canTransformResource(path)).isEqualTo(expected)
   }
 
-  @ParameterizedTest(name = "{index} => path={0}")
+  @ParameterizedTest
   @MethodSource("transformsServiceFileData")
   fun transformServiceFile(path: String, input1: String, input2: String, output: String) {
     if (transformer.canTransformResource(path)) {

From a782e75a5d80c567dfbbf5807d16210f29816aef Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 28 Jan 2025 09:38:07 +0800
Subject: [PATCH 2/2] Unify MethodSource names

---
 .../shadow/transformers/TransformersTest.kt   |  4 ++--
 .../Log4j2PluginsCacheFileTransformerTest.kt  |  9 +++++----
 .../PropertiesFileTransformerTest.kt          | 20 +++++++++----------
 .../ServiceFileTransformerTest.kt             |  8 ++++----
 4 files changed, 21 insertions(+), 20 deletions(-)

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<String, KClass<*>>) {
     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<Log4j2PluginsC
   }
 
   @ParameterizedTest
-  @MethodSource("relocationParameters")
-  fun relocations(pattern: String, shadedPattern: String, target: String) {
+  @MethodSource("relocationProvider")
+  fun relocations(pattern: String, shadedPattern: String, expected: String) {
     val aggregator = PluginCache().apply {
       val resources = Collections.enumeration(listOf(pluginCacheUrl))
       loadCacheFiles(resources)
@@ -103,7 +104,7 @@ class Log4j2PluginsCacheFileTransformerTest : BaseTransformerTest<Log4j2PluginsC
 
     for (pluginEntryMap in aggregator.allCategories.values) {
       for (entry in pluginEntryMap.values) {
-        assertThat(entry.className.startsWith(target)).isTrue()
+        assertThat(entry.className).startsWith(expected)
       }
     }
   }
@@ -116,7 +117,7 @@ class Log4j2PluginsCacheFileTransformerTest : BaseTransformerTest<Log4j2PluginsC
     val pluginCacheUrl: URL = requireNotNull(this::class.java.classLoader.getResource(PLUGIN_CACHE_FILE))
 
     @JvmStatic
-    fun relocationParameters() = listOf(
+    fun relocationProvider() = listOf(
       // test with matching relocator
       Arguments.of("org.apache.logging", "new.location.org.apache.logging", "new.location.org.apache.logging"),
       // test without matching relocator
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
index bf4a3c974..d6f900b98 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
@@ -61,7 +61,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
   }
 
   @ParameterizedTest
-  @MethodSource("transformConfigurationsProvider")
+  @MethodSource("transformConfigProvider")
   fun exerciseAllTransformConfigurations(
     path: String,
     mergeStrategy: String,
@@ -82,7 +82,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
   }
 
   @ParameterizedTest
-  @MethodSource("transformConfigurationsWithPathsProvider")
+  @MethodSource("transformConfigWithPathsProvider")
   fun exerciseAllTransformConfigurationsWithPaths(
     path: String,
     paths: List<String>,
@@ -102,7 +102,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
   }
 
   @ParameterizedTest
-  @MethodSource("transformConfigurationsWithMappingsProvider")
+  @MethodSource("transformConfigWithMappingsProvider")
   fun exerciseAllTransformConfigurationsWithMappings(
     path: String,
     mappings: Map<String, Map<String, String>>,
@@ -122,7 +122,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
   }
 
   @ParameterizedTest
-  @MethodSource("appliesKeyTransformerProvider")
+  @MethodSource("keyTransformerProvider")
   fun appliesKeyTransformer(
     path: String,
     keyTransformer: (String) -> String,
@@ -142,7 +142,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
   }
 
   @ParameterizedTest
-  @MethodSource("appliesCharsetProvider")
+  @MethodSource("charsetProvider")
   fun appliesCharset(
     path: String,
     charset: String,
@@ -172,7 +172,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     )
 
     @JvmStatic
-    fun appliesCharsetProvider() = listOf(
+    fun charsetProvider() = listOf(
       Arguments.of(
         "utf8.properties",
         "utf-8",
@@ -182,7 +182,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     )
 
     @JvmStatic
-    fun transformConfigurationsWithPathsProvider() = listOf(
+    fun transformConfigWithPathsProvider() = listOf(
       Arguments.of(
         "f.properties",
         listOf("f.properties"),
@@ -214,7 +214,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     )
 
     @JvmStatic
-    fun transformConfigurationsWithMappingsProvider() = listOf(
+    fun transformConfigWithMappingsProvider() = listOf(
       Arguments.of(
         "f.properties",
         mapOf("f.properties" to mapOf("mergeStrategy" to "first")),
@@ -260,7 +260,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     )
 
     @JvmStatic
-    fun transformConfigurationsProvider() = listOf(
+    fun transformConfigProvider() = listOf(
       Arguments.of(
         "f.properties",
         "first",
@@ -296,7 +296,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest<PropertiesFileTransfor
     )
 
     @JvmStatic
-    fun appliesKeyTransformerProvider() = listOf(
+    fun keyTransformerProvider() = listOf(
       Arguments.of(
         "foo.properties",
         { key: String -> 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 39e47071a..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
@@ -11,7 +11,7 @@ import org.junit.jupiter.params.provider.MethodSource
 
 class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>() {
   @ParameterizedTest
-  @MethodSource("canTransformResourceData")
+  @MethodSource("resourceProvider")
   fun canTransformResource(path: String, exclude: Boolean, expected: Boolean) {
     if (exclude) {
       transformer.exclude(path)
@@ -20,7 +20,7 @@ class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>()
   }
 
   @ParameterizedTest
-  @MethodSource("transformsServiceFileData")
+  @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<ServiceFileTransformer>()
     }
 
     @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<ServiceFileTransformer>()
     )
 
     @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"),