Skip to content

Commit 975e8a8

Browse files
authored
Rename test lifecycle functions (#1727)
1 parent 75f6736 commit 975e8a8

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ abstract class BasePluginTest {
6363
val outputServerShadowedJar: JarPath get() = jarPath("server/build/libs/server-1.0-all.jar")
6464

6565
@BeforeAll
66-
open fun doFirst() {
66+
fun beforeAll() {
6767
localRepo = AppendableMavenRepository(
6868
createTempDirectory().resolve("local-maven-repo").createDirectories(),
6969
runner(projectDir = null),
@@ -124,18 +124,18 @@ abstract class BasePluginTest {
124124
}
125125

126126
@BeforeEach
127-
open fun setup() {
127+
open fun beforeEach() {
128128
projectScript.writeText(getDefaultProjectBuildScript(withGroup = true, withVersion = true))
129129
settingsScript.writeText(getDefaultSettingsBuildScript())
130130
}
131131

132132
@AfterEach
133-
fun cleanup() {
133+
fun afterEach() {
134134
println(projectScript.readText())
135135
}
136136

137137
@AfterAll
138-
fun doLast() {
138+
fun afterAll() {
139139
@OptIn(ExperimentalPathApi::class)
140140
localRepo.root.deleteRecursively()
141141
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import org.junit.jupiter.params.provider.ValueSource
1212

1313
class FilteringTest : BasePluginTest() {
1414
@BeforeEach
15-
override fun setup() {
16-
super.setup()
15+
override fun beforeEach() {
16+
super.beforeEach()
1717
projectScript.appendText(
1818
"""
1919
dependencies {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test
1010

1111
class GroovyPluginTest : BasePluginTest() {
1212
@BeforeEach
13-
override fun setup() {
14-
super.setup()
13+
override fun beforeEach() {
14+
super.beforeEach()
1515
val projectBuildScript = getDefaultProjectBuildScript(
1616
plugin = "groovy",
1717
withGroup = true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import org.junit.jupiter.params.provider.ValueSource
1919

2020
class KotlinPluginsTest : BasePluginTest() {
2121
@BeforeEach
22-
override fun setup() {
23-
super.setup()
22+
override fun beforeEach() {
23+
super.beforeEach()
2424
val projectBuildScript = getDefaultProjectBuildScript(
2525
plugin = "org.jetbrains.kotlin.multiplatform",
2626
withGroup = true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class PublishingTest : BasePluginTest() {
5454
lateinit var remoteRepoPath: Path
5555

5656
@BeforeEach
57-
override fun setup() {
58-
super.setup()
57+
override fun beforeEach() {
58+
super.beforeEach()
5959
settingsScript.appendText("rootProject.name = 'maven'$lineSeparator")
6060
}
6161

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test
1010

1111
class ScalaPluginTest : BasePluginTest() {
1212
@BeforeEach
13-
override fun setup() {
14-
super.setup()
13+
override fun beforeEach() {
14+
super.beforeEach()
1515
val projectBuildScript = getDefaultProjectBuildScript(
1616
plugin = "scala",
1717
withGroup = true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeEach
88

99
abstract class BaseTransformerTest : BasePluginTest() {
1010
@BeforeEach
11-
override fun setup() {
12-
super.setup()
11+
override fun beforeEach() {
12+
super.beforeEach()
1313
projectScript.appendText(
1414
"""
1515
$shadowJarTask {

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ abstract class BaseTransformerTest<T : ResourceTransformer> {
2323
get() = TransformerContext(MANIFEST_NAME, requireResourceAsStream(MANIFEST_NAME))
2424

2525
@BeforeEach
26-
open fun setup() {
26+
open fun beforeEach() {
2727
@Suppress("UNCHECKED_CAST")
2828
val clazz = (this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments.first() as Class<T>
2929
transformer = clazz.create(testObjectFactory)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class ServiceFileTransformerTest : BaseTransformerTest<ServiceFileTransformer>()
2727
private lateinit var tempJar: Path
2828

2929
@BeforeEach
30-
override fun setup() {
31-
super.setup()
30+
override fun beforeEach() {
31+
super.beforeEach()
3232
tempJar = createTempFile("shade.", ".jar")
3333
}
3434

3535
@AfterEach
36-
fun cleanup() {
36+
fun afterEach() {
3737
tempJar.deleteExisting()
3838
}
3939

0 commit comments

Comments
 (0)