Fix tests

Author: Goooler

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

@@ -118,6 +118,7 @@ class FilteringTest : BasePluginTest() {
     assertThat(outputShadowJar).useAll {
       containsOnly(
         "d.properties",
+        "my/",
         "my/Passed.class",
         *manifestEntries,
         includeDirs = true,
@@ -164,6 +165,8 @@ class FilteringTest : BasePluginTest() {
 
     assertThat(outputServerShadowJar).useAll {
       containsOnly(
+        "client/",
+        "server/",
         "client/Client.class",
         "server/Server.class",
         *manifestEntries,

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

@@ -156,16 +156,21 @@ class JavaPluginTest : BasePluginTest() {
 
     assertThat(jarPath("server/build/libs/server-1.0.jar")).useAll {
       containsOnly(
+        "server/",
         "server/Server.class",
         *manifestEntries,
         includeDirs = true,
       )
     }
     assertThat(jarPath("client/build/libs/client-1.0-all.jar")).useAll {
       containsAtLeast(
+        "client/",
         "client/Client.class",
         "client/junit/framework/Test.class",
       )
+      containsNone(
+        "server/Server.class",
+      )
     }
   }
 
@@ -257,6 +262,7 @@ class JavaPluginTest : BasePluginTest() {
 
     assertThat(outputShadowJar).useAll {
       containsOnly(
+        "my/",
         "my/Passed.class",
         "a.properties",
         "META-INF/a.properties",
@@ -491,6 +497,9 @@ class JavaPluginTest : BasePluginTest() {
       getMainAttr(classPathAttributeKey).isNull()
 
       containsOnly(
+        "my/",
+        "my/plugin/",
+        "META-INF/gradle-plugins/",
         "my/plugin/MyPlugin.class",
         "META-INF/gradle-plugins/my.plugin.properties",
         *entriesInA,

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

@@ -59,6 +59,9 @@ class MinimizationTest : BasePluginTest() {
 
     assertThat(jarPath("impl/build/libs/impl-all.jar")).useAll {
       containsOnly(
+        "api/",
+        "impl/",
+        "lib/",
         "impl/SimpleEntity.class",
         "api/Entity.class",
         "api/UnusedEntity.class",
@@ -220,13 +223,17 @@ class MinimizationTest : BasePluginTest() {
 
     assertThat(outputServerShadowJar).useAll {
       if (enable) {
-        containsOnly(
+        containsAtLeast(
           "server/Server.class",
-          *manifestEntries,
-          includeDirs = true,
+          manifestEntry,
+        )
+        containsNone(
+          "client/Client.class",
         )
       } else {
         containsOnly(
+          "client/",
+          "server/",
           "client/Client.class",
           "server/Server.class",
           *junitEntries,

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

@@ -3,7 +3,6 @@ package com.github.jengelman.gradle.plugins.shadow
 import assertk.assertFailure
 import assertk.assertThat
 import assertk.assertions.contains
-import assertk.assertions.containsOnly
 import assertk.assertions.isEmpty
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotEmpty
@@ -316,6 +315,7 @@ class RelocationTest : BasePluginTest() {
 
     assertThat(outputShadowJar).useAll {
       containsOnly(
+        "bar/",
         "bar/Foo.class",
         "bar/foo.properties",
         "bar/dep.properties",
@@ -510,10 +510,14 @@ class RelocationTest : BasePluginTest() {
           includeDirs = true,
         )
       } else {
-        containsOnly(
+        containsAtLeast(
           "foo/$manifestEntry",
           *junitEntries.map { "foo/$it" }.toTypedArray(),
         )
+        containsNone(
+          *junitEntries,
+          manifestEntry,
+        )
       }
     }
   }
@@ -567,13 +571,16 @@ class RelocationTest : BasePluginTest() {
     assertThat(outputShadowJar).useAll {
       if (enableRelocation) {
         containsOnly(
+          "my/",
+          "$relocationPrefix/",
           mainClassEntry,
           *relocatedEntries,
           *manifestEntries,
           includeDirs = true,
         )
       } else {
         containsOnly(
+          "my/",
           mainClassEntry,
           *junitEntries,
           *manifestEntries,

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

@@ -98,6 +98,7 @@ class FilteringCachingTest : BaseCachingTest() {
 
     assertCompositeExecutions {
       containsOnly(
+        "my/",
         mainClassEntry,
         main2ClassEntry,
         *manifestEntries,
@@ -115,6 +116,7 @@ class FilteringCachingTest : BaseCachingTest() {
 
     assertCompositeExecutions {
       containsOnly(
+        "my/",
         mainClassEntry,
         *manifestEntries,
         includeDirs = true,
@@ -131,6 +133,7 @@ class FilteringCachingTest : BaseCachingTest() {
 
     assertCompositeExecutions {
       containsOnly(
+        "my/",
         mainClassEntry,
         main2ClassEntry,
         *manifestEntries,
@@ -169,6 +172,7 @@ class FilteringCachingTest : BaseCachingTest() {
 
     assertCompositeExecutions {
       containsOnly(
+        "my/",
         mainClassEntry,
         *manifestEntries,
         includeDirs = true,