Fix merge

GradleUp · Dec 4, 2024 · b90a8e5 · b90a8e5
1 parent 7c566b6
commit b90a8e5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/...est/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt b/...est/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt
@@ -3,12 +3,12 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats
 import com.github.jengelman.gradle.plugins.shadow.internal.createDefaultFileTreeElement
 import com.github.jengelman.gradle.plugins.shadow.internal.inputStream
-import java.io.FileNotFoundException
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer.Companion.create
 import com.github.jengelman.gradle.plugins.shadow.util.testObjectFactory
+import java.io.FileNotFoundException
 import java.io.InputStream
-import java.nio.charset.Charset
 import java.lang.reflect.ParameterizedType
+import java.nio.charset.Charset
 import java.nio.file.Path
 import java.util.Locale
 import java.util.Properties

diff --git a/...hub/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt b/...hub/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerTest.kt
@@ -9,16 +9,9 @@ import java.net.URL
 import java.util.Collections
 import org.apache.logging.log4j.core.config.plugins.processor.PluginCache
 import org.apache.tools.zip.ZipOutputStream
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 class Log4j2PluginsCacheFileTransformerTest : BaseTransformerTest<Log4j2PluginsCacheFileTransformer>() {
-
-  @BeforeEach
-  fun setup() {
-    transformer = Log4j2PluginsCacheFileTransformer()
-  }
-
   @Test
   fun `should transform for a single file`() {
     transformer.transform(TransformerContext(PLUGIN_CACHE_FILE, requireResourceAsStream(PLUGIN_CACHE_FILE)))

diff --git a/.../com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/.../com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
@@ -9,7 +9,6 @@ import assertk.assertions.isTrue
 import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer.MergeStrategy
 import groovy.lang.Closure
 import java.nio.charset.Charset
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments

diff --git a/...lin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt b/...lin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt
@@ -2,18 +2,12 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 
 class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>() {
-  @BeforeEach
-  fun setup() {
-    transformer = ServiceFileTransformer()
-  }
-
   @ParameterizedTest(name = "{index} => path={0}, exclude={1}, expected={2}")
   @MethodSource("canTransformResourceData")
   fun `test canTransformResource`(path: String, exclude: Boolean, expected: Boolean) {