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

[Native][tests] Minor. Organize imports

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-12-06 18:31:45 +03:00
parent ab4f60b105
commit b78ff1d61a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestNameExtractor.kt
+2 -2
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.TestExecutable
import org.jetbrains.kotlin.konan.blackboxtest.support.TestName import org.jetbrains.kotlin.konan.blackboxtest.support.TestName
import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter
import org.jetbrains.kotlin.konan.blackboxtest.support.util.parseGTestListing import org.jetbrains.kotlin.konan.blackboxtest.support.util.parseGTestListing
import org.jetbrains.kotlin.test.services.JUnit5Assertions import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import kotlin.time.Duration import kotlin.time.Duration
internal class LocalTestNameExtractor( internal class LocalTestNameExtractor(
@@ -30,7 +30,7 @@ internal class LocalTestNameExtractor(
override fun buildResultHandler(runResult: RunResult.Completed) = ResultHandler(runResult) override fun buildResultHandler(runResult: RunResult.Completed) = ResultHandler(runResult)
override fun handleUnexpectedFailure(t: Throwable) = JUnit5Assertions.fail { override fun handleUnexpectedFailure(t: Throwable) = fail {
LoggedData.TestRunUnexpectedFailure(getLoggedParameters(), t) LoggedData.TestRunUnexpectedFailure(getLoggedParameters(), t)
.withErrorMessage("Test name extraction failed with unexpected exception.") .withErrorMessage("Test name extraction failed with unexpected exception.")
} }
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/GlobalSettings.kt
+7 -7
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.konan.blackboxtest.support.settings
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.test.services.JUnit5Assertions import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import java.io.File import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
import kotlin.time.Duration import kotlin.time.Duration
@@ -30,7 +30,7 @@ internal class GlobalSettings(
companion object { companion object {
private val defaultKotlinNativeHome: File private val defaultKotlinNativeHome: File
get() = System.getProperty(KOTLIN_NATIVE_HOME)?.let(::File) ?: JUnit5Assertions.fail { "Non-specified $KOTLIN_NATIVE_HOME system property" } get() = System.getProperty(KOTLIN_NATIVE_HOME)?.let(::File) ?: fail { "Non-specified $KOTLIN_NATIVE_HOME system property" }
// Use isolated cached class loader. // Use isolated cached class loader.
private val defaultKotlinNativeClassLoader: Lazy<ClassLoader> = lazy { private val defaultKotlinNativeClassLoader: Lazy<ClassLoader> = lazy {
@@ -38,7 +38,7 @@ internal class GlobalSettings(
?.split(':', ';') ?.split(':', ';')
?.map { File(it).toURI().toURL() } ?.map { File(it).toURI().toURL() }
?.toTypedArray() ?.toTypedArray()
?: JUnit5Assertions.fail { "Non-specified $COMPILER_CLASSPATH system property" } ?: fail { "Non-specified $COMPILER_CLASSPATH system property" }
URLClassLoader(nativeClassPath, /* no parent class loader */ null).apply { setDefaultAssertionStatus(true) } URLClassLoader(nativeClassPath, /* no parent class loader */ null).apply { setDefaultAssertionStatus(true) }
} }
@@ -46,7 +46,7 @@ internal class GlobalSettings(
private val defaultTestMode: TestMode = run { private val defaultTestMode: TestMode = run {
val testModeName = System.getProperty(TEST_MODE) ?: return@run TestMode.WITH_MODULES val testModeName = System.getProperty(TEST_MODE) ?: return@run TestMode.WITH_MODULES
TestMode.values().firstOrNull { it.name == testModeName } ?: JUnit5Assertions.fail { TestMode.values().firstOrNull { it.name == testModeName } ?: fail {
buildString { buildString {
appendLine("Unknown test mode name $testModeName.") appendLine("Unknown test mode name $testModeName.")
appendLine("One of the following test modes should be passed through $TEST_MODE system property:") appendLine("One of the following test modes should be passed through $TEST_MODE system property:")
@@ -60,7 +60,7 @@ internal class GlobalSettings(
private val defaultCacheSettings: CacheSettings = run { private val defaultCacheSettings: CacheSettings = run {
val useCacheValue = System.getProperty(USE_CACHE) val useCacheValue = System.getProperty(USE_CACHE)
val useCache = if (useCacheValue != null) { val useCache = if (useCacheValue != null) {
useCacheValue.toBooleanStrictOrNull() ?: JUnit5Assertions.fail { "Invalid value for $USE_CACHE system property: $useCacheValue" } useCacheValue.toBooleanStrictOrNull() ?: fail { "Invalid value for $USE_CACHE system property: $useCacheValue" }
} else } else
true true
@@ -71,13 +71,13 @@ internal class GlobalSettings(
val executionTimeoutValue = System.getProperty(EXECUTION_TIMEOUT) val executionTimeoutValue = System.getProperty(EXECUTION_TIMEOUT)
if (executionTimeoutValue != null) { if (executionTimeoutValue != null) {
executionTimeoutValue.toLongOrNull()?.milliseconds executionTimeoutValue.toLongOrNull()?.milliseconds
?: JUnit5Assertions.fail { "Invalid value for $EXECUTION_TIMEOUT system property: $executionTimeoutValue" } ?: fail { "Invalid value for $EXECUTION_TIMEOUT system property: $executionTimeoutValue" }
} else } else
DEFAULT_EXECUTION_TIMEOUT DEFAULT_EXECUTION_TIMEOUT
} }
private val projectBuildDir: File private val projectBuildDir: File
get() = System.getenv(PROJECT_BUILD_DIR)?.let(::File) ?: JUnit5Assertions.fail { "Non-specified $PROJECT_BUILD_DIR environment variable" } get() = System.getenv(PROJECT_BUILD_DIR)?.let(::File) ?: fail { "Non-specified $PROJECT_BUILD_DIR environment variable" }
private const val KOTLIN_NATIVE_HOME = "kotlin.internal.native.test.nativeHome" private const val KOTLIN_NATIVE_HOME = "kotlin.internal.native.test.nativeHome"
private const val COMPILER_CLASSPATH = "kotlin.internal.native.test.compilerClasspath" private const val COMPILER_CLASSPATH = "kotlin.internal.native.test.compilerClasspath"