Shorten caching tests (#1211)

* Tweak MinimizationCachingTest * Tweak RelocationCachingTest * Tweak ShadowJarCachingTest
GradleUp · Jan 28, 2025 · 529edc1 · 529edc1
1 parent 83ca343
commit 529edc1
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 59 deletions.
diff --git a/...Test/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt b/...Test/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingTest.kt
@@ -40,27 +40,21 @@ class MinimizationCachingTest : BaseCachingTest() {
         }
       """.trimIndent(),
     )
-
-    assertFirstExecutionSuccess()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "server/Server.class",
-        "junit/framework/Test.class",
-      )
-      doesNotContainEntries(
-        "client/Client.class",
-      )
+    val assertions = {
+      assertThat(outputShadowJar).useAll {
+        containsEntries(
+          "server/Server.class",
+          "junit/framework/Test.class",
+        )
+        doesNotContainEntries(
+          "client/Client.class",
+        )
+      }
     }
 
+    assertFirstExecutionSuccess()
+    assertions()
     assertExecutionsAreCachedAndUpToDate()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "server/Server.class",
-        "junit/framework/Test.class",
-      )
-      doesNotContainEntries(
-        "client/Client.class",
-      )
-    }
+    assertions()
   }
 }
diff --git a/...alTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt b/...alTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt
@@ -36,27 +36,21 @@ class RelocationCachingTest : BaseCachingTest() {
         }
       """.trimIndent(),
     )
-
-    assertFirstExecutionSuccess()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "shadow/Main.class",
-        "foo/junit/framework/Test.class",
-      )
-      doesNotContainEntries(
-        "junit/framework/Test.class",
-      )
+    val assertions = {
+      assertThat(outputShadowJar).useAll {
+        containsEntries(
+          "shadow/Main.class",
+          "foo/junit/framework/Test.class",
+        )
+        doesNotContainEntries(
+          "junit/framework/Test.class",
+        )
+      }
     }
 
+    assertFirstExecutionSuccess()
+    assertions()
     assertExecutionsAreCachedAndUpToDate()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "shadow/Main.class",
-        "foo/junit/framework/Test.class",
-      )
-      doesNotContainEntries(
-        "junit/framework/Test.class",
-      )
-    }
+    assertions()
   }
 }
diff --git a/...nalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt b/...nalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt
@@ -27,11 +27,13 @@ class ShadowJarCachingTest : BaseCachingTest() {
     assertFirstExecutionSuccess()
     assertExecutionsAreCachedAndUpToDate()
 
-    val replaced = projectScriptPath.readText().lines().filter {
-      it != fromJar(projectJar)
-    }.joinToString(System.lineSeparator())
+    val replaced = projectScriptPath.readText().lines()
+      .filterNot { it == fromJar(projectJar) }
+      .joinToString(System.lineSeparator())
     projectScriptPath.writeText(replaced)
+
     assertFirstExecutionSuccess()
+    assertExecutionsAreCachedAndUpToDate()
   }
 
   @Test
@@ -45,6 +47,7 @@ class ShadowJarCachingTest : BaseCachingTest() {
     )
 
     assertFirstExecutionSuccess()
+    assertThat(outputShadowJar).isRegular()
 
     projectScriptPath.appendText(
       """
@@ -53,6 +56,7 @@ class ShadowJarCachingTest : BaseCachingTest() {
         }
       """.trimIndent(),
     )
+
     assertExecutionsAreCachedAndUpToDate()
     assertThat(jarPath("build/libs/foo-1.0-all.jar")).isRegular()
   }
@@ -154,6 +158,7 @@ class ShadowJarCachingTest : BaseCachingTest() {
 
   @Test
   fun shadowJarIsCachedCorrectlyWhenUsingDependencyIncludesExcludes() {
+    writeMainClass(withImports = true)
     projectScriptPath.appendText(
       """
         dependencies {
@@ -162,8 +167,6 @@ class ShadowJarCachingTest : BaseCachingTest() {
       """.trimIndent() + System.lineSeparator(),
     )
 
-    writeMainClass(withImports = true)
-
     assertFirstExecutionSuccess()
     assertThat(outputShadowJar).useAll {
       containsEntries(
@@ -181,24 +184,20 @@ class ShadowJarCachingTest : BaseCachingTest() {
         }
       """.trimIndent(),
     )
-    assertFirstExecutionSuccess()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "shadow/Main.class",
-      )
-      doesNotContainEntries(
-        "junit/framework/Test.class",
-      )
+    val assertions = {
+      assertThat(outputShadowJar).useAll {
+        containsEntries(
+          "shadow/Main.class",
+        )
+        doesNotContainEntries(
+          "junit/framework/Test.class",
+        )
+      }
     }
 
+    assertFirstExecutionSuccess()
+    assertions()
     assertExecutionsAreCachedAndUpToDate()
-    assertThat(outputShadowJar).useAll {
-      containsEntries(
-        "shadow/Main.class",
-      )
-      doesNotContainEntries(
-        "junit/framework/Test.class",
-      )
-    }
+    assertions()
   }
 }