Skip to content

Commit 1e8c480

Browse files
committed
Simplified test implementation for creating fake downloaded Gradle distributions
1 parent 525367c commit 1e8c480

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/test/kotlin/tech/harmonysoft/oss/gradle/dist/CustomGradleDistributionPluginTest.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class CustomGradleDistributionPluginTest {
149149

150150
@Test
151151
fun `when custom single gradle distribution is built with non-default distribution type then it contains base distribution type`() {
152-
val testFiles = withDistributionType("all").doTest("single-distribution-no-templates", """
152+
val testFiles = doTest("single-distribution-no-templates", """
153153
plugins {
154154
id("tech.harmonysoft.oss.custom-gradle-dist-plugin")
155155
}
@@ -208,7 +208,7 @@ class CustomGradleDistributionPluginTest {
208208

209209
@Test
210210
fun `when multiple distributions are configured with non-default type then multiple distributions with correct names are created`() {
211-
val testFiles = withDistributionType("all").doTest("multiple-distributions", """
211+
val testFiles = doTest("multiple-distributions", """
212212
plugins {
213213
id("tech.harmonysoft.oss.custom-gradle-dist-plugin")
214214
}
@@ -231,7 +231,7 @@ class CustomGradleDistributionPluginTest {
231231

232232
@Test
233233
fun `when custom distribution file name mapper is configured in gradle groovy script then it is respected`() {
234-
val testFiles = withDistributionType("all").prepareInput("single-distribution-no-templates", """
234+
val testFiles = prepareInput("single-distribution-no-templates", """
235235
import tech.harmonysoft.oss.gradle.dist.config.CustomDistributionNameMapper
236236
237237
plugins {
@@ -257,7 +257,7 @@ class CustomGradleDistributionPluginTest {
257257

258258
@Test
259259
fun `when custom distribution file name mapper is configured in gradle kotlin script then it is respected`() {
260-
val testFiles = withDistributionType("all").doTest("single-distribution-no-templates", """
260+
val testFiles = doTest("single-distribution-no-templates", """
261261
import tech.harmonysoft.oss.gradle.dist.config.CustomDistributionNameMapper
262262
plugins {
263263
id("tech.harmonysoft.oss.custom-gradle-dist-plugin")
@@ -446,8 +446,10 @@ class CustomGradleDistributionPluginTest {
446446
private fun prepareGradleDistributionZip(projectRootDir: File) {
447447
val downloadDir = File(projectRootDir, "build/download")
448448
Files.createDirectories(downloadDir.toPath())
449-
val zip = File(downloadDir, "gradle-${GRADLE_VERSION}-${distributionType}.zip")
450-
createGradleDistributionZip(zip)
449+
listOf("bin", "all").forEach {
450+
val zip = File(downloadDir, "gradle-${GRADLE_VERSION}-${it}.zip")
451+
createGradleDistributionZip(zip)
452+
}
451453
}
452454

453455
private fun createGradleDistributionZip(zip: File) {
@@ -581,13 +583,6 @@ class CustomGradleDistributionPluginTest {
581583
verify(testFiles.expectedRootDir, File(testFiles.inputRootDir, buildDistsDir))
582584
}
583585

584-
private fun withDistributionType(type: String): CustomGradleDistributionPluginTest {
585-
distributionType = type
586-
return this
587-
}
588-
589-
private var distributionType = DEFAULT_DISTRIBUTION_TYPE
590-
591586
data class TestFiles(
592587
val inputRootDir: File,
593588
val expectedRootDir: File

0 commit comments

Comments
 (0)