Improve RelocationTest and junit entry checks (#1270)

* Improve `defaultEnableRelocation`

* Improve `relocateDependencyFiles`

* Improve `relocateDependencyFilesWithFiltering`

* Improve `remapClassNamesForRelocatedFilesInProjectSource`

* Improve `relocateDoesNotDropDependencyResources`

* Improve `doesNotErrorOnRelocatingJava9Classes`

* Reuse `junitEntries` read from the real jar

Author: Goooler

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt

@@ -73,7 +73,7 @@ class ApplicationPluginTest : BasePluginTest() {
 
     commonAssertions(
       jarPath("myapp-shadow/lib/myapp-1.0-all.jar", installPath),
-      entriesContained = arrayOf("my/Main.class", "junit/framework/Test.class"),
+      entriesContained = arrayOf("my/Main.class", *junitEntries),
     )
 
     val unixScript = path("myapp-shadow/bin/myapp", installPath)

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

@@ -193,7 +193,7 @@ abstract class BasePluginTest {
     packageName: String = "my",
     withImports: Boolean = false,
     className: String = "Main",
-  ) {
+  ): String {
     val imports = if (withImports) "import junit.framework.Test;" else ""
     val classRef = if (withImports) "\"Refs: \" + Test.class.getName()" else "\"Refs: null\""
     path("src/$sourceSet/java/$packageName/$className.java").writeText(
@@ -212,6 +212,7 @@ abstract class BasePluginTest {
         }
       """.trimIndent(),
     )
+    return packageName.replace('.', '/') + "/$className.class"
   }
 
   fun writeClientAndServerModules(
@@ -347,6 +348,11 @@ abstract class BasePluginTest {
     }
 
     val junitJar: Path = requireResourceAsPath("junit-3.8.2.jar")
+    val junitEntries: Array<String> = JarPath(junitJar)
+      .use { it.entries().toList() }
+      .map { entry -> entry.name }
+      .filterNot { it == "junit3.8.2/" || it.startsWith("META-INF/") }
+      .toTypedArray()
 
     val shadowJar: String = """
       tasks.named('$SHADOW_JAR_TASK_NAME', ${ShadowJar::class.java.name})

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt

@@ -190,7 +190,7 @@ class FilteringTest : BasePluginTest() {
     assertThat(outputServerShadowJar).useAll {
       containsEntries(
         "server/Server.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
       doesNotContainEntries(
         "client/Client.class",
@@ -216,7 +216,7 @@ class FilteringTest : BasePluginTest() {
         "server/Server.class",
       )
       doesNotContainEntries(
-        "junit/framework/Test.class",
+        *junitEntries,
       )
     }
   }

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginTest.kt

@@ -84,7 +84,7 @@ class JavaPluginTest : BasePluginTest() {
     assertThat(outputShadowJar).useAll {
       containsEntries(
         "my/Main.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
     }
   }
@@ -123,7 +123,7 @@ class JavaPluginTest : BasePluginTest() {
     assertThat(jarPath("build/libs/fat.jar")).useAll {
       containsEntries(
         "my/Passed.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
       doesNotContainEntries("/")
     }
@@ -139,7 +139,7 @@ class JavaPluginTest : BasePluginTest() {
       containsEntries(
         "client/Client.class",
         "server/Server.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
     }
   }
@@ -156,7 +156,7 @@ class JavaPluginTest : BasePluginTest() {
       )
       doesNotContainEntries(
         "client/Client.class",
-        "junit/framework/Test.class",
+        *junitEntries,
         "client/junit/framework/Test.class",
       )
     }
@@ -171,17 +171,19 @@ class JavaPluginTest : BasePluginTest() {
   @Test
   fun shadowProjectShadowJar() {
     writeClientAndServerModules(clientShadowed = true)
+    val shadowedEntries = junitEntries
+      .map { it.replace("junit/framework/", "client/junit/framework/") }.toTypedArray()
 
     run(serverShadowJarTask)
 
     assertThat(outputServerShadowJar).useAll {
       containsEntries(
         "client/Client.class",
-        "client/junit/framework/Test.class",
         "server/Server.class",
+        *shadowedEntries,
       )
       doesNotContainEntries(
-        "junit/framework/Test.class",
+        *junitEntries.filter { it.startsWith("junit/framework/") }.toTypedArray(),
       )
     }
     assertThat(jarPath("client/build/libs/client-1.0-all.jar")).useAll {
@@ -523,8 +525,8 @@ class JavaPluginTest : BasePluginTest() {
     assertThat(result).taskOutcomeEquals(":$testShadowJarTask", SUCCESS)
     assertThat(jarPath("build/libs/my-1.0-tests.jar")).useAll {
       containsEntries(
-        "junit/framework/Test.class",
         "my/Main.class",
+        *junitEntries,
       )
       getMainAttr(mainClassAttributeKey).isNotNull()
     }
@@ -618,7 +620,7 @@ class JavaPluginTest : BasePluginTest() {
     assertThat(jarPath("build/libs/my-shadow.tar")).useAll {
       containsEntries(
         "my/Main.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
     }
   }

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/MinimizeTest.kt

@@ -63,7 +63,7 @@ class MinimizeTest : BasePluginTest() {
         "lib/UnusedLibEntity.class",
       )
       doesNotContainEntries(
-        "junit/framework/Test.class",
+        *junitEntries,
       )
     }
   }
@@ -123,7 +123,7 @@ class MinimizeTest : BasePluginTest() {
     assertThat(outputServerShadowJar).useAll {
       containsEntries(
         "server/Server.class",
-        "junit/framework/Test.class",
+        *junitEntries,
       )
       doesNotContainEntries(
         "client/Client.class",
@@ -184,7 +184,7 @@ class MinimizeTest : BasePluginTest() {
       containsEntries(
         "client/Client.class",
         "server/Server.class",
-        "junit/framework/TestCase.class",
+        *junitEntries,
       )
     }
 
@@ -200,7 +200,7 @@ class MinimizeTest : BasePluginTest() {
       containsEntries(
         "client/Client.class",
         "server/Server.class",
-        "junit/framework/TestCase.class",
+        *junitEntries,
       )
     }
   }