Skip to content

Commit 4bf651a

Browse files
authored
[KotlinTest] Port remainging tests to Kotlin (#65)
* [KotlinTest] Port remainging tests to Kotlin Closes #58 * formatting * detekt
1 parent b2d379d commit 4bf651a

File tree

8 files changed

+265
-263
lines changed

8 files changed

+265
-263
lines changed

build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,14 @@ dependencies {
7272
implementation("com.google.guava:guava:31.1-jre")
7373
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
7474

75-
testApi("junit:junit:4.13.2")
76-
7775
testCompileOnly("org.jetbrains:annotations:24.0.1")
7876

7977
testImplementation(localGroovy())
8078
testImplementation(gradleTestKit())
79+
testImplementation("junit:junit:4.13.2")
8180
testImplementation("org.assertj:assertj-core:3.24.2")
8281
}
8382

84-
tasks.compileTestGroovy {
85-
classpath += files(tasks.compileTestKotlin.flatMap { it.destinationDirectory })
86-
}
87-
88-
tasks.testClasses {
89-
dependsOn(tasks.compileTestGroovy)
90-
}
91-
9283
tasks.check {
9384
dependsOn(tasks.named("projectHealth"))
9485
}

src/test/groovy/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.groovy

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

src/test/groovy/org/assertj/generator/gradle/parameter/SkipParameter.groovy

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

src/test/kotlin/org/assertj/generator/gradle/AssertExtensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.assertj.core.api.AbstractObjectAssert
44
import org.gradle.testkit.runner.BuildTask
55
import org.gradle.testkit.runner.TaskOutcome
66

7-
fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isSuccessful(): SELF = isOutcome(TaskOutcome.SUCCESS)
8-
fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isUpToDate(): SELF = isOutcome(TaskOutcome.UP_TO_DATE)
7+
internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isSuccessful(): SELF = isOutcome(TaskOutcome.SUCCESS)
8+
internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isUpToDate(): SELF = isOutcome(TaskOutcome.UP_TO_DATE)
99

1010
private fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isOutcome(outcome: TaskOutcome): SELF {
1111
extracting { it?.outcome }.`as` { "task.outcome == $outcome" }.isEqualTo(outcome)

src/test/kotlin/org/assertj/generator/gradle/IoExtensions.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import java.io.File
55
import java.nio.file.Path
66
import kotlin.io.path.writeText
77

8-
fun File.writeJava(@Language("java") content: String): Unit = writeText(content.trimIndent())
9-
fun Path.writeJava(@Language("java") content: String): Unit = writeText(content.trimIndent())
8+
internal fun File.writeJava(@Language("java") content: String): Unit = writeText(content.trimIndent())
9+
internal fun Path.writeJava(@Language("java") content: String): Unit = writeText(content.trimIndent())
1010

11-
fun File.writeGroovy(@Language("groovy") content: String): Unit = writeText(content.trimIndent())
12-
fun Path.writeGroovy(@Language("groovy") content: String): Unit = writeText(content.trimIndent())
11+
internal fun File.writeGroovy(@Language("groovy") content: String): Unit = writeText(content.trimIndent())
12+
internal fun Path.writeGroovy(@Language("groovy") content: String): Unit = writeText(content.trimIndent())
1313

14-
fun File.writeKotlin(@Language("kotlin") content: String): Unit = writeText(content.trimIndent())
15-
fun Path.writeKotlin(@Language("kotlin") content: String): Unit = writeText(content.trimIndent())
14+
internal fun File.writeKotlin(@Language("kotlin") content: String): Unit = writeText(content.trimIndent())
15+
internal fun Path.writeKotlin(@Language("kotlin") content: String): Unit = writeText(content.trimIndent())

src/test/kotlin/org/assertj/generator/gradle/TestUtils.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@
1212
*/
1313
package org.assertj.generator.gradle
1414

15-
import groovy.lang.GString
1615
import org.intellij.lang.annotations.Language
1716
import java.io.File
1817

1918
/**
2019
* Utilities used in test scripts
2120
*/
2221
internal object TestUtils {
23-
@JvmStatic
24-
fun File.writeBuildFile(@Language("Groovy") content: GString) = writeBuildFile(content.toString())
25-
2622
@JvmStatic
2723
fun File.writeBuildFile(@Language("Groovy") content: String) {
2824
writeGroovy(

0 commit comments

Comments
 (0)