Cleanups

GradleUp · Jan 4, 2025 · de997b3 · de997b3
1 parent d71a924
commit de997b3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationTest.kt
@@ -42,7 +42,9 @@ class ApplicationTest : BasePluginTest() {
 
     val installedJar = jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar")
     assertThat(installedJar).exists()
-    assertThat(installedJar).containsEntries(listOf("a.properties", "a2.properties", "myapp/Main.class"))
+    assertThat(installedJar).containsEntries(
+      listOf("a.properties", "a2.properties", "myapp/Main.class"),
+    )
     assertThat(installedJar.manifest.mainAttributes.getValue("Main-Class"))
       .isEqualTo("myapp.Main")
 

diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt
@@ -113,8 +113,8 @@ class RelocationTest : BasePluginTest() {
         "junit/framework/TestSuite.class",
       ),
     )
-
-    assertThat(outputShadowJar.manifest.mainAttributes.getValue("TEST-VALUE")).isEqualTo("FOO")
+    assertThat(outputShadowJar.manifest.mainAttributes.getValue("TEST-VALUE"))
+      .isEqualTo("FOO")
   }
 
   @Test

diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt
@@ -124,8 +124,8 @@ class ShadowPluginTest : BasePluginTest() {
     )
 
     run(shadowJarTask)
-    val outputShadowJar = jarPath("build/libs/shadow.jar")
 
+    val outputShadowJar = jarPath("build/libs/shadow.jar")
     assertThat(outputShadowJar).exists()
     assertThat(outputShadowJar).containsEntries(
       listOf("shadow/Passed.class", "junit/framework/Test.class"),
@@ -283,8 +283,8 @@ class ShadowPluginTest : BasePluginTest() {
     writeApiLibAndImplModules()
 
     run(":impl:$shadowJarTask")
-    val implOutput = jarPath("impl/build/libs/impl-all.jar")
 
+    val implOutput = jarPath("impl/build/libs/impl-all.jar")
     assertThat(implOutput).exists()
     assertThat(implOutput).containsEntries(
       listOf("impl/SimpleEntity.class", "api/Entity.class", "api/UnusedEntity.class", "lib/LibEntity.class"),
@@ -313,8 +313,8 @@ class ShadowPluginTest : BasePluginTest() {
     )
 
     run(":impl:$shadowJarTask")
-    val implOutput = jarPath("impl/build/libs/impl-all.jar")
 
+    val implOutput = jarPath("impl/build/libs/impl-all.jar")
     assertThat(implOutput).exists()
     assertThat(implOutput).containsEntries(
       listOf(
@@ -335,9 +335,8 @@ class ShadowPluginTest : BasePluginTest() {
     writeShadowedClientAndServerModules()
 
     run(":server:jar")
-    val serverOutput = jarPath("server/build/libs/server-1.0.jar")
-    val clientOutput = jarPath("client/build/libs/client-all.jar")
 
+    val serverOutput = jarPath("server/build/libs/server-1.0.jar")
     assertThat(serverOutput).exists()
     assertThat(serverOutput).containsEntries(
       listOf("server/Server.class"),
@@ -346,6 +345,7 @@ class ShadowPluginTest : BasePluginTest() {
       listOf("client/Client.class", "junit/framework/Test.class", "client/junit/framework/Test.class"),
     )
 
+    val clientOutput = jarPath("client/build/libs/client-all.jar")
     assertThat(clientOutput).exists()
     assertThat(clientOutput).containsEntries(
       listOf("client/Client.class", "client/junit/framework/Test.class"),
@@ -357,7 +357,6 @@ class ShadowPluginTest : BasePluginTest() {
     writeShadowedClientAndServerModules()
 
     run(serverShadowJarTask)
-    val clientOutput = jarPath("client/build/libs/client-all.jar")
 
     assertThat(outputServerShadowJar).exists()
     assertThat(outputServerShadowJar).containsEntries(
@@ -366,6 +365,8 @@ class ShadowPluginTest : BasePluginTest() {
     assertThat(outputServerShadowJar).doesNotContainEntries(
       listOf("junit/framework/Test.class"),
     )
+
+    val clientOutput = jarPath("client/build/libs/client-all.jar")
     assertThat(clientOutput).exists()
     assertThat(clientOutput).containsEntries(
       listOf("client/Client.class", "client/junit/framework/Test.class"),
@@ -757,11 +758,10 @@ class ShadowPluginTest : BasePluginTest() {
     )
 
     val result = run(testShadowJarTask)
-    val testJar = jarPath("build/libs/shadow-1.0-tests.jar")
 
     assertThat(result.task(":$testShadowJarTask")).isNotNull()
       .transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
-
+    val testJar = jarPath("build/libs/shadow-1.0-tests.jar")
     assertThat(testJar).exists()
     assertThat(testJar.getEntry("junit")).isNotNull()
   }

diff --git a/...tiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/...tiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt
@@ -114,7 +114,6 @@ class TransformersTest : BaseTransformerTest() {
     run(shadowJarTask)
 
     assertThat(outputShadowJar).exists()
-
     val mf = outputShadowJar.manifest
     assertThat(mf).isNotNull()
     assertThat(mf.mainAttributes.getValue("Test-Entry")).isEqualTo("PASSED")
@@ -197,16 +196,15 @@ class TransformersTest : BaseTransformerTest() {
 
     run("jar", shadowJarTask)
 
-    val outputJar = jarPath("build/libs/shadow-1.0.jar")
-    assertThat(outputJar).exists()
     assertThat(outputShadowJar).exists()
-
     val mf1 = outputShadowJar.manifest
     assertThat(mf1).isNotNull()
     assertThat(mf1.mainAttributes.getValue("Test-Entry")).isEqualTo("PASSED")
     assertThat(mf1.mainAttributes.getValue("Main-Class")).isEqualTo("shadow.Main")
     assertThat(mf1.mainAttributes.getValue("New-Entry")).isEqualTo("NEW")
 
+    val outputJar = jarPath("build/libs/shadow-1.0.jar")
+    assertThat(outputJar).exists()
     val mf2 = outputJar.manifest
     assertThat(mf2).isNotNull()
     assertThat(mf2.mainAttributes.getValue("Test-Entry")).isEqualTo("FAILED")