Skip to content

Commit

Permalink
Rewrite tests using Groovy DSL to use Kotlin DSL
Browse files Browse the repository at this point in the history
  • Loading branch information
@3flex
3flex committed Apr 6, 2022
1 parent 3f06104 commit 8323cbd
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 71 deletions.
32 changes: 16 additions & 16 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt
View file
Expand Up @@ -271,7 +271,7 @@ class DetektAndroidSpec {
$LIB_PLUGIN_BLOCK
$ANDROID_BLOCK_WITH_FLAVOR
detekt {
ignoredBuildTypes = ["release"]
ignoredBuildTypes = listOf("release")
}
""".trimIndent(),
srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java")
Expand Down Expand Up @@ -326,7 +326,7 @@ class DetektAndroidSpec {
$LIB_PLUGIN_BLOCK
$ANDROID_BLOCK_WITH_FLAVOR
detekt {
ignoredVariants = ["youngHarryDebug", "oldHarryRelease"]
ignoredVariants = listOf("youngHarryDebug", "oldHarryRelease")
}
""".trimIndent(),
srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java")
Expand Down Expand Up @@ -381,7 +381,7 @@ class DetektAndroidSpec {
$LIB_PLUGIN_BLOCK
$ANDROID_BLOCK_WITH_FLAVOR
detekt {
ignoredFlavors = ["youngHarry"]
ignoredFlavors = listOf("youngHarry")
}
""".trimIndent(),
srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java")
Expand Down Expand Up @@ -440,46 +440,46 @@ internal fun manifestContent(packageName: String = "io.gitlab.arturbosch.detekt.

private val APP_PLUGIN_BLOCK = """
plugins {
id "com.android.application"
id "kotlin-android"
id "io.gitlab.arturbosch.detekt"
id("com.android.application")
id("kotlin-android")
id("io.gitlab.arturbosch.detekt")
}
""".trimIndent()

private val LIB_PLUGIN_BLOCK = """
plugins {
id "com.android.library"
id "kotlin-android"
id "io.gitlab.arturbosch.detekt"
id("com.android.library")
id("kotlin-android")
id("io.gitlab.arturbosch.detekt")
}
""".trimIndent()

private val ANDROID_BLOCK = """
android {
compileSdkVersion 30
compileSdkVersion(30)
}
""".trimIndent()

private val ANDROID_BLOCK_WITH_FLAVOR = """
android {
compileSdkVersion 30
compileSdkVersion(30)
flavorDimensions("age", "name")
productFlavors {
harry {
create("harry") {
dimension = "name"
}
young {
create("young") {
dimension = "age"
}
old {
create("old") {
dimension = "age"
}
}
}
""".trimIndent()

private val DETEKT_REPORTS_BLOCK = """
tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports {
txt.enabled = false
}
Expand All @@ -488,7 +488,7 @@ private val DETEKT_REPORTS_BLOCK = """

private fun createGradleRunnerAndSetupProject(projectLayout: ProjectLayout) = DslGradleRunner(
projectLayout = projectLayout,
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
mainBuildFileContent = """
subprojects {
repositories {
Expand Down
18 changes: 9 additions & 9 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt
View file
Expand Up @@ -19,7 +19,7 @@ class DetektJvmSpec {

val gradleRunner = DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 1),
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
baselineFiles = listOf("detekt-baseline.xml", "detekt-baseline-main.xml", "detekt-baseline-test.xml"),
projectScript = {
apply<KotlinPluginWrapper>()
Expand Down Expand Up @@ -68,11 +68,11 @@ class DetektJvmSpec {
inner class `report location set on extension & task` {
val gradleRunner = DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 1),
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
mainBuildFileContent = """
plugins {
id "org.jetbrains.kotlin.jvm"
id "io.gitlab.arturbosch.detekt"
id("org.jetbrains.kotlin.jvm")
id("io.gitlab.arturbosch.detekt")
}
repositories {
Expand All @@ -86,7 +86,7 @@ class DetektJvmSpec {
}
}
tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports {
txt.destination = file("output-path2.txt")
}
Expand All @@ -109,19 +109,19 @@ class DetektJvmSpec {
inner class `report location set on task only` {
val gradleRunner = DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 1),
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
mainBuildFileContent = """
plugins {
id "org.jetbrains.kotlin.jvm"
id "io.gitlab.arturbosch.detekt"
id("org.jetbrains.kotlin.jvm")
id("io.gitlab.arturbosch.detekt")
}
repositories {
mavenCentral()
mavenLocal()
}
tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports {
txt.destination = file("output-path2.txt")
}
Expand Down
16 changes: 8 additions & 8 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt
View file
Expand Up @@ -148,12 +148,12 @@ class DetektMultiplatformSpec {
1,
buildFileContent = """
plugins {
id "kotlin-multiplatform"
id "com.android.library"
id "io.gitlab.arturbosch.detekt"
id("kotlin-multiplatform")
id("com.android.library")
id("io.gitlab.arturbosch.detekt")
}
android {
compileSdkVersion 30
compileSdkVersion(30)
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
buildTypes {
release {
Expand Down Expand Up @@ -318,7 +318,7 @@ class DetektMultiplatformSpec {
private fun setupProject(projectLayoutAction: ProjectLayout.() -> Unit): DslGradleRunner {
return DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 0).apply { projectLayoutAction() },
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
mainBuildFileContent = """
subprojects {
repositories {
Expand Down Expand Up @@ -362,13 +362,13 @@ private fun assertDetektWithClasspath(buildResult: BuildResult) {

private val KMM_PLUGIN_BLOCK = """
plugins {
id "kotlin-multiplatform"
id "io.gitlab.arturbosch.detekt"
id("kotlin-multiplatform")
id("io.gitlab.arturbosch.detekt")
}
""".trimIndent()

private val DETEKT_BLOCK = """
tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports.txt.enabled = false
}
""".trimIndent()
Expand Down
14 changes: 7 additions & 7 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainSpec.kt
View file
Expand Up @@ -11,11 +11,11 @@ class DetektPlainSpec {
inner class `When detekt is applied before JVM plugin` {
val gradleRunner = DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 1),
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
mainBuildFileContent = """
plugins {
id "io.gitlab.arturbosch.detekt"
id "org.jetbrains.kotlin.jvm"
id("io.gitlab.arturbosch.detekt")
id("org.jetbrains.kotlin.jvm")
}
repositories {
Expand All @@ -41,20 +41,20 @@ class DetektPlainSpec {
inner class `When applying detekt in a project` {
val gradleRunner = DslGradleRunner(
projectLayout = ProjectLayout(numberOfSourceFilesInRootPerSourceDir = 1),
buildFileName = "build.gradle",
buildFileName = "build.gradle.kts",
baselineFiles = listOf("detekt-baseline.xml"),
mainBuildFileContent = """
plugins {
id "org.jetbrains.kotlin.jvm"
id "io.gitlab.arturbosch.detekt"
id("org.jetbrains.kotlin.jvm")
id("io.gitlab.arturbosch.detekt")
}
repositories {
mavenCentral()
mavenLocal()
}
tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports {
sarif.enabled = true
txt.enabled = false
Expand Down
8 changes: 4 additions & 4 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektTaskDslSpec.kt
View file
Expand Up @@ -383,7 +383,7 @@ class DetektTaskDslSpec {
@BeforeAll
fun beforeGroup() {
val config = """
|tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
|tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
| reports {
| custom {
| destination = file("build/reports/custom.xml")
Expand All @@ -406,7 +406,7 @@ class DetektTaskDslSpec {
@BeforeAll
fun beforeGroup() {
val config = """
|tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
|tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
| reports {
| custom {
| reportId = "customJson"
Expand All @@ -431,7 +431,7 @@ class DetektTaskDslSpec {
val aDirectory = "\${rootDir}/src"

val config = """
|tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
|tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
| reports {
| custom {
| reportId = "foo"
Expand All @@ -456,7 +456,7 @@ class DetektTaskDslSpec {
@EnumSource(DetektReportType::class)
fun `fails the build`(wellKnownType: DetektReportType) {
val config = """
|tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach {
|tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
| reports {
| custom {
| reportId = "${wellKnownType.reportId}"
Expand Down

0 comments on commit 8323cbd

Please sign in to comment.