cleanup

Author: snazy

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

@@ -2,11 +2,8 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.any
 import assertk.assertions.contains
 import assertk.assertions.containsExactlyInAnyOrder
-import assertk.assertions.containsSubList
-import assertk.assertions.endsWith
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNotEqualTo
 import assertk.assertions.isNotNull
@@ -61,72 +58,6 @@ class TransformersTest : BaseTransformerTest() {
       ),
     )
 
-    if (excludeAll) {
-      runWithSuccess(shadowJarPath)
-      assertThat(outputShadowedJar).useAll {
-        containsExactlyInAnyOrder(
-          // twice:
-          "multiple-contents",
-          "multiple-contents",
-          "single-source",
-          "same-content-twice",
-          // twice:
-          "differing-content-2",
-          "differing-content-2",
-          "META-INF/",
-          "META-INF/MANIFEST.MF",
-        )
-        getContents("multiple-contents").containsExactlyInAnyOrder("content", "content-is-different")
-        getContent("single-source").isEqualTo("content")
-        getContent("same-content-twice").isEqualTo("content")
-        getContents("differing-content-2").containsExactlyInAnyOrder("content", "content-is-different")
-      }
-    } else {
-      val buildResult = runWithFailure(shadowJarPath)
-      assertThat(buildResult.task(":shadowJar")!!.outcome).isSameInstanceAs(TaskOutcome.FAILED)
-      val outputLines = buildResult.output.lines()
-      assertThat(outputLines).containsSubList(
-        listOf(
-          // Keep this list approach for Unix/Windows test compatibility.
-          "Execution failed for task ':shadowJar'.",
-          "> Found 1 path duplicate(s) with different content in the shadow JAR:",
-          "    * differing-content-2",
-        ),
-      )
-      assertThat(outputLines).any {
-        it.endsWith("differing-content-2 (Hash: -1337566116240053116)")
-      }
-      assertThat(outputLines).any {
-        it.endsWith("differing-content-2 (Hash: -6159701213549668473)")
-      }
-    }
-  }
-
-  @ParameterizedTest
-  @ValueSource(booleans = [false, true])
-  fun deduplicatingResourceTransformerEXPERIMENT(excludeAll: Boolean) {
-    val one = buildJarOne {
-      insert("multiple-contents", "content")
-      insert("single-source", "content")
-      insert("same-content-twice", "content")
-      insert("differing-content-2", "content")
-    }
-    val two = buildJarTwo {
-      insert("multiple-contents", "content-is-different")
-      insert("same-content-twice", "content")
-      insert("differing-content-2", "content-is-different")
-    }
-
-    projectScript.appendText(
-      transform<DeduplicatingResourceTransformer>(
-        dependenciesBlock = implementationFiles(one, two),
-        transformerBlock = """
-          exclude("multiple-contents")
-          ${if (excludeAll) "exclude(\"differing-content-2\")" else ""}
-        """.trimIndent(),
-      ),
-    )
-
     if (excludeAll) {
       runWithSuccess(shadowJarPath)
       assertThat(outputShadowedJar).useAll {
@@ -151,11 +82,10 @@ class TransformersTest : BaseTransformerTest() {
       val buildResult = runWithFailure(shadowJarPath)
       assertThat(buildResult.task(":shadowJar")!!.outcome).isSameInstanceAs(TaskOutcome.FAILED)
       assertThat(buildResult.output).contains(
-        """
-          Execution failed for task ':shadowJar'.
-          > Found 1 path duplicate(s) with different content in the shadow JAR:
-              * differing-content-2
-        """.trimIndent().replace("\n", System.lineSeparator()),
+        // Keep this list approach for Unix/Windows test compatibility.
+        "Execution failed for task ':shadowJar'.",
+        "> Found 1 path duplicate(s) with different content in the shadow JAR:",
+        "    * differing-content-2",
         "differing-content-2 (Hash: -1337566116240053116)",
         "differing-content-2 (Hash: -6159701213549668473)",
       )