azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Native][tests] Fix conditions for @InputFile properties

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-08-31 17:28:22 +03:00
parent bf82db5ee2
commit ab5314059d
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+33 -21
View File
@@ -227,18 +227,27 @@ open class KonanLocalTest : KonanTest() {
var useGoldenData: Boolean = false var useGoldenData: Boolean = false
@get:InputFile @get:InputFile
open val goldenDataFile: File @get:Optional
open val goldenDataFile: File?
get() { get() {
val sourceFile = project.file(source) val goldenDataFile = computeGoldenDataFile()
return sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + ".out") return if (useGoldenData) {
check(goldenDataFile.isFile) { "Task $name. Golden data file does not exist: $goldenDataFile" }
goldenDataFile
} else {
check(!goldenDataFile.exists()) { "Task $name. Golden data file should not exist: $goldenDataFile" }
null
}
} }
@Internal
protected open fun computeGoldenDataFile(): File {
val sourceFile = project.file(source)
return sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + ".out")
}
private val goldenData: String? private val goldenData: String?
get() = if (useGoldenData) { get() = goldenDataFile?.readText(Charsets.UTF_8)
check(goldenDataFile.isFile) { "Task $name. Golden data file does not exist: $goldenDataFile" }
goldenDataFile.readText(Charsets.UTF_8)
} else
null
/** /**
* Checks test's output against gold value and returns true if the output matches the expectation. * Checks test's output against gold value and returns true if the output matches the expectation.
@@ -257,18 +266,22 @@ open class KonanLocalTest : KonanTest() {
var useTestData: Boolean = false var useTestData: Boolean = false
@get:InputFile @get:InputFile
val testDataFile: File @get:Optional
val testDataFile: File?
get() { get() {
val sourceFile = project.file(source) val sourceFile = project.file(source)
return sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + ".in") val testDataFile = sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + ".in")
return if (useTestData) {
check(testDataFile.isFile) { "Task $name. Test data file does not exist: $testDataFile" }
testDataFile
} else {
check(!testDataFile.exists()) { "Task $name. Test data file should not exist: $testDataFile" }
null
}
} }
private val testData: String? private val testData: String?
get() = if (useTestData) { get() = testDataFile?.readText(Charsets.UTF_8)
check(testDataFile.isFile) { "Task $name. Test data file does not exist: $testDataFile" }
testDataFile.readText(Charsets.UTF_8)
} else
null
/** /**
* Should compiler message be read and validated with output checker or gold value. * Should compiler message be read and validated with output checker or gold value.
@@ -490,12 +503,11 @@ open class KonanDynamicTest : KonanStandaloneTest() {
@Optional @Optional
var interop: String? = null var interop: String? = null
override val goldenDataFile: File override fun computeGoldenDataFile(): File {
get() { val sourceFile = project.file(source)
val sourceFile = project.file(source) val cSourceFile = File(cSource)
val cSourceFile = File(cSource) return sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + "-" + cSourceFile.nameWithoutExtension + ".out")
return sourceFile.parentFile.resolve(sourceFile.nameWithoutExtension + "-" + cSourceFile.nameWithoutExtension + ".out") }
}
// Replace testlib_api.h and all occurrences of the testlib with the actual name of the test // Replace testlib_api.h and all occurrences of the testlib with the actual name of the test
private fun processCSource(): String { private fun processCSource(): String {