Skip to content

Commit cd0013b

Browse files
authored
Revert "Add BooleanParameterizedTest" (#1266)
This reverts commit ad448a5
1 parent 6ff7ad9 commit cd0013b

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import com.github.jengelman.gradle.plugins.shadow.internal.mainClassAttributeKey
1616
import com.github.jengelman.gradle.plugins.shadow.internal.multiReleaseAttributeKey
1717
import com.github.jengelman.gradle.plugins.shadow.legacy.LegacyShadowPlugin
1818
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
19-
import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
2019
import com.github.jengelman.gradle.plugins.shadow.util.Issue
2120
import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
2221
import com.github.jengelman.gradle.plugins.shadow.util.doesNotContainEntries
@@ -32,6 +31,8 @@ import org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
3231
import org.junit.jupiter.api.Test
3332
import org.junit.jupiter.api.condition.DisabledForJreRange
3433
import org.junit.jupiter.api.condition.JRE
34+
import org.junit.jupiter.params.ParameterizedTest
35+
import org.junit.jupiter.params.provider.ValueSource
3536

3637
class JavaPluginTest : BasePluginTest() {
3738
@Test
@@ -465,7 +466,8 @@ class JavaPluginTest : BasePluginTest() {
465466
"https://github.com/GradleUp/shadow/issues/459",
466467
"https://github.com/GradleUp/shadow/issues/852",
467468
)
468-
@BooleanParameterizedTest
469+
@ParameterizedTest
470+
@ValueSource(booleans = [false, true])
469471
fun excludeGradleApiByDefault(legacy: Boolean) {
470472
writeGradlePluginModule(legacy)
471473
projectScriptPath.appendText(

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import assertk.assertions.isEqualTo
99
import assertk.assertions.single
1010
import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin.Companion.SHADOW_RUNTIME_ELEMENTS_CONFIGURATION_NAME
1111
import com.github.jengelman.gradle.plugins.shadow.internal.classPathAttributeKey
12-
import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
1312
import com.github.jengelman.gradle.plugins.shadow.util.GradleModuleMetadata
1413
import com.github.jengelman.gradle.plugins.shadow.util.Issue
1514
import com.github.jengelman.gradle.plugins.shadow.util.JarPath
@@ -42,6 +41,8 @@ import org.gradle.testkit.runner.BuildResult
4241
import org.junit.jupiter.api.BeforeEach
4342
import org.junit.jupiter.api.Test
4443
import org.junit.jupiter.api.io.TempDir
44+
import org.junit.jupiter.params.ParameterizedTest
45+
import org.junit.jupiter.params.provider.ValueSource
4546

4647
class PublishingTest : BasePluginTest() {
4748
@TempDir
@@ -139,7 +140,8 @@ class PublishingTest : BasePluginTest() {
139140
assertShadowVariantCommon(gmmAdapter.fromJson(repoPath("shadow/maven/1.0/maven-1.0.module")))
140141
}
141142

142-
@BooleanParameterizedTest
143+
@ParameterizedTest
144+
@ValueSource(booleans = [false, true])
143145
fun publishShadowedGradlePlugin(legacy: Boolean) {
144146
writeGradlePluginModule(legacy)
145147
projectScriptPath.appendText(

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
5-
import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
65
import com.github.jengelman.gradle.plugins.shadow.util.getContent
76
import kotlin.io.path.appendText
7+
import org.junit.jupiter.params.ParameterizedTest
8+
import org.junit.jupiter.params.provider.ValueSource
89

910
class AppendingTransformerTest : BaseTransformerTest() {
10-
@BooleanParameterizedTest
11+
@ParameterizedTest
12+
@ValueSource(booleans = [false, true])
1113
fun appendTestProperties(shortSyntax: Boolean) {
1214
val one = buildJarOne {
1315
insert(ENTRY_TEST_PROPERTIES, CONTENT_ONE)
@@ -40,7 +42,8 @@ class AppendingTransformerTest : BaseTransformerTest() {
4042
assertThat(content).isEqualTo(CONTENT_ONE_TWO)
4143
}
4244

43-
@BooleanParameterizedTest
45+
@ParameterizedTest
46+
@ValueSource(booleans = [false, true])
4447
fun appendApplicationYaml(shortSyntax: Boolean) {
4548
val one = buildJarOne {
4649
insert("resources/$APPLICATION_YML_FILE", CONTENT_ONE)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionMo
1010
import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.MERGED_MODULE_VERSION
1111
import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.PATH_GROOVY_EXTENSION_MODULE_DESCRIPTOR
1212
import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR
13-
import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
1413
import com.github.jengelman.gradle.plugins.shadow.util.getContent
1514
import java.nio.file.Path
1615
import kotlin.io.path.appendText
1716
import org.junit.jupiter.api.Test
17+
import org.junit.jupiter.params.ParameterizedTest
18+
import org.junit.jupiter.params.provider.ValueSource
1819

1920
class GroovyExtensionModuleTransformerTest : BaseTransformerTest() {
20-
@BooleanParameterizedTest
21+
@ParameterizedTest
22+
@ValueSource(booleans = [false, true])
2123
fun groovyExtensionModuleTransformer(shortSyntax: Boolean) {
2224
val config = if (shortSyntax) {
2325
"""

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
5-
import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
65
import com.github.jengelman.gradle.plugins.shadow.util.Issue
76
import com.github.jengelman.gradle.plugins.shadow.util.getContent
87
import kotlin.io.path.appendText
98
import kotlin.io.path.writeText
109
import org.junit.jupiter.api.Test
10+
import org.junit.jupiter.params.ParameterizedTest
11+
import org.junit.jupiter.params.provider.ValueSource
1112

1213
class ServiceFileTransformerTest : BaseTransformerTest() {
13-
@BooleanParameterizedTest
14+
@ParameterizedTest
15+
@ValueSource(booleans = [false, true])
1416
fun serviceResourceTransformer(shortSyntax: Boolean) {
1517
val config = if (shortSyntax) {
1618
"""
@@ -41,7 +43,8 @@ class ServiceFileTransformerTest : BaseTransformerTest() {
4143
}
4244
}
4345

44-
@BooleanParameterizedTest
46+
@ParameterizedTest
47+
@ValueSource(booleans = [false, true])
4548
fun serviceResourceTransformerAlternatePath(shortSyntax: Boolean) {
4649
val one = buildJarOne {
4750
insert(ENTRY_FOO_SHADE, CONTENT_ONE)

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)