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

[Test] Allow alternate output for box tests

Browse Source
This commit is contained in:
Brian Norman
2023-12-01 09:34:29 -06:00
committed by Space Team
parent aa34282efb
commit 9f5589614a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt
+11 -2
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.test.services.jvm.jvmBoxMainClassProvider
import org.jetbrains.kotlin.test.services.sourceProviders.MainFunctionForBlackBoxTestsSourceProvider import org.jetbrains.kotlin.test.services.sourceProviders.MainFunctionForBlackBoxTestsSourceProvider
import org.jetbrains.kotlin.test.services.sourceProviders.MainFunctionForBlackBoxTestsSourceProvider.Companion.fileContainsBoxMethod import org.jetbrains.kotlin.test.services.sourceProviders.MainFunctionForBlackBoxTestsSourceProvider.Companion.fileContainsBoxMethod
import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.kotlin.test.utils.withExtension
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.runIf
import java.io.File import java.io.File
@@ -44,6 +45,8 @@ import java.util.concurrent.TimeUnit
open class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { open class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) {
companion object { companion object {
private val BOX_IN_SEPARATE_PROCESS_PORT = System.getProperty("kotlin.test.box.in.separate.process.port") private val BOX_IN_SEPARATE_PROCESS_PORT = System.getProperty("kotlin.test.box.in.separate.process.port")
private const val DEFAULT_EXPECTED_RESULT = "OK"
private const val OUTPUT_EXTENSION = "box.txt"
} }
private var boxMethodFound = false private var boxMethodFound = false
@@ -144,9 +147,15 @@ open class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(t
} }
} }
if (unexpectedBehaviour) { if (unexpectedBehaviour) {
TestCase.assertNotSame("OK", result) TestCase.assertNotSame(DEFAULT_EXPECTED_RESULT, result)
} else { } else {
assertions.assertEquals("OK", result) val originalFile = testServices.moduleStructure.originalTestDataFiles.first()
val outputFile = originalFile.withExtension(OUTPUT_EXTENSION)
if (outputFile.exists()) {
assertions.assertEqualsToFile(outputFile, result)
} else {
assertions.assertEquals(DEFAULT_EXPECTED_RESULT, result)
}
} }
} }