Improve entry checks (#1342)

* Add `containsFileEntriesOnly`

* Optimize `containsEntries`

* Optimize `doesNotContainEntries`

* Rename assertions to match the ones in AssertK

* Replace `containsNone` checks

* Tweak autoRelocation

* Cleanups

* Revert changes for `preserveLastModifiedCorrectly`

Author: Goooler

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

@@ -12,7 +12,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.classPathAttributeKey
 import com.github.jengelman.gradle.plugins.shadow.internal.mainClassAttributeKey
 import com.github.jengelman.gradle.plugins.shadow.util.Issue
 import com.github.jengelman.gradle.plugins.shadow.util.JarPath
-import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
+import com.github.jengelman.gradle.plugins.shadow.util.containsAtLeast
 import com.github.jengelman.gradle.plugins.shadow.util.getContent
 import com.github.jengelman.gradle.plugins.shadow.util.getMainAttr
 import com.github.jengelman.gradle.plugins.shadow.util.isWindows
@@ -251,7 +251,7 @@ class ApplicationPluginTest : BasePluginTest() {
     classPathAttr: String? = null,
   ) {
     assertThat(jarPath).useAll {
-      containsEntries(*entriesContained)
+      containsAtLeast(*entriesContained)
       getMainAttr(mainClassAttributeKey).isEqualTo(mainClassAttr)
       getMainAttr(classPathAttributeKey).isEqualTo(classPathAttr)
     }

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

@@ -386,6 +386,7 @@ abstract class BasePluginTest {
       }
     }
 
+  @Suppress("ConstPropertyName")
   companion object {
     val testKitDir: Path = run {
       var gradleUserHome = System.getenv("GRADLE_USER_HOME")
@@ -398,14 +399,15 @@ abstract class BasePluginTest {
     val junitJar: Path = requireResourceAsPath("junit-3.8.2.jar")
     val junitRawEntries: List<JarEntry> = JarPath(junitJar)
       .use { it.entries().toList() }
-      .filterNot { it.name == "junit3.8.2/" || it.name.startsWith("META-INF/") }
+      .filterNot {
+        // This entry is not present in the jar file.
+        it.name == "junit3.8.2/"
+      }
     val junitEntries: Array<String> = junitRawEntries.map { it.name }.toTypedArray()
+    const val manifestEntry = "META-INF/MANIFEST.MF"
 
-    val shadowJar: String = """
-      tasks.named('$SHADOW_JAR_TASK_NAME', ${ShadowJar::class.java.name})
-    """.trimIndent()
-
-    val runShadow = "tasks.named('$SHADOW_RUN_TASK_NAME', JavaExec)".trim()
+    val shadowJar: String = "tasks.named('$SHADOW_JAR_TASK_NAME', ${ShadowJar::class.java.name})"
+    const val runShadow = "tasks.named('$SHADOW_RUN_TASK_NAME', JavaExec)"
 
     val commonArguments = listOf(
       "--warning-mode=fail",

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

@@ -1,8 +1,9 @@
 package com.github.jengelman.gradle.plugins.shadow
 
 import assertk.assertThat
-import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
-import com.github.jengelman.gradle.plugins.shadow.util.doesNotContainEntries
+import com.github.jengelman.gradle.plugins.shadow.util.containsAtLeast
+import com.github.jengelman.gradle.plugins.shadow.util.containsNone
+import com.github.jengelman.gradle.plugins.shadow.util.containsOnly
 import kotlin.io.path.appendText
 import kotlin.io.path.writeText
 import org.junit.jupiter.api.BeforeAll
@@ -35,7 +36,7 @@ class FilteringTest : BasePluginTest() {
   fun includeAllDependencies() {
     run(shadowJarTask)
     assertThat(outputShadowJar).useAll {
-      containsEntries(*entriesInAB)
+      containsAtLeast(*entriesInAB)
     }
   }
 
@@ -52,12 +53,10 @@ class FilteringTest : BasePluginTest() {
     run(shadowJarTask)
 
     assertThat(outputShadowJar).useAll {
-      containsEntries(
+      containsOnly(
         "a.properties",
         "b.properties",
-      )
-      doesNotContainEntries(
-        "a2.properties",
+        manifestEntry,
       )
     }
   }
@@ -116,13 +115,10 @@ class FilteringTest : BasePluginTest() {
     run(shadowJarTask)
 
     assertThat(outputShadowJar).useAll {
-      containsEntries(
+      containsOnly(
         "d.properties",
         "my/Passed.class",
-      )
-      doesNotContainEntries(
-        *entriesInAB,
-        "c.properties",
+        manifestEntry,
       )
     }
   }
@@ -142,11 +138,11 @@ class FilteringTest : BasePluginTest() {
     run(serverShadowJarTask)
 
     assertThat(outputServerShadowJar).useAll {
-      containsEntries(
+      containsAtLeast(
         "server/Server.class",
         *junitEntries,
       )
-      doesNotContainEntries(
+      containsNone(
         "client/Client.class",
       )
     }
@@ -165,12 +161,10 @@ class FilteringTest : BasePluginTest() {
     run(serverShadowJarTask)
 
     assertThat(outputServerShadowJar).useAll {
-      containsEntries(
+      containsOnly(
         "client/Client.class",
         "server/Server.class",
-      )
-      doesNotContainEntries(
-        *junitEntries,
+        manifestEntry,
       )
     }
   }
@@ -190,12 +184,10 @@ class FilteringTest : BasePluginTest() {
     run(shadowJarTask)
 
     assertThat(outputShadowJar).useAll {
-      containsEntries(
+      containsOnly(
         "a.properties",
         "b.properties",
-      )
-      doesNotContainEntries(
-        "a2.properties",
+        manifestEntry,
       )
     }
   }
@@ -237,12 +229,10 @@ class FilteringTest : BasePluginTest() {
 
   private fun commonAssertions() {
     assertThat(outputShadowJar).useAll {
-      containsEntries(
-        *entriesInAB,
+      containsOnly(
         "c.properties",
-      )
-      doesNotContainEntries(
-        "d.properties",
+        *entriesInAB,
+        manifestEntry,
       )
     }
   }

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

@@ -2,7 +2,7 @@ package com.github.jengelman.gradle.plugins.shadow
 
 import assertk.assertThat
 import com.github.jengelman.gradle.plugins.shadow.util.JvmLang
-import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
+import com.github.jengelman.gradle.plugins.shadow.util.containsAtLeast
 import kotlin.io.path.appendText
 import kotlin.io.path.writeText
 import org.junit.jupiter.api.BeforeEach
@@ -35,7 +35,7 @@ class GroovyPluginTest : BasePluginTest() {
     run(shadowJarTask)
 
     assertThat(outputShadowJar).useAll {
-      containsEntries(
+      containsAtLeast(
         mainClassEntry,
         *junitEntries,
       )