android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-24 18:41:06 +03:00
Code Releases Activity

Fix single failing graal test (#6445)

Browse Source
This commit is contained in:
Yuri Schimke
2020-11-22 17:12:58 +00:00
committed by GitHub
parent 70e02ead14
commit a334f6f14f
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
native-image-tests/src/main/kotlin/okhttp3/DotListener.kt
View File

@@ -44,7 +44,7 @@ object DotListener: TestExecutionListener {
) { ) {
if (!testIdentifier.isContainer) { if (!testIdentifier.isContainer) {
when (testExecutionResult.status!!) { when (testExecutionResult.status!!) {
TestExecutionResult.Status.ABORTED -> printStatus("E") TestExecutionResult.Status.ABORTED -> printStatus("-")
TestExecutionResult.Status.FAILED -> printStatus("F") TestExecutionResult.Status.FAILED -> printStatus("F")
TestExecutionResult.Status.SUCCESSFUL -> printStatus(".") TestExecutionResult.Status.SUCCESSFUL -> printStatus(".")
} }

3
okhttp-testing-support/src/main/kotlin/okhttp3/TestUtil.kt
View File

@@ -30,8 +30,7 @@ object TestUtil {
val UNREACHABLE_ADDRESS = InetSocketAddress("198.51.100.1", 8080) val UNREACHABLE_ADDRESS = InetSocketAddress("198.51.100.1", 8080)
/** See `org.graalvm.nativeimage.ImageInfo`. */ /** See `org.graalvm.nativeimage.ImageInfo`. */
@JvmStatic @JvmStatic val isGraalVmImage = System.getProperty("org.graalvm.nativeimage.imagecode") != null
private val isGraalVmImage = System.getProperty("org.graalvm.nativeimage.imagecode") != null
@JvmStatic @JvmStatic
fun headerEntries(vararg elements: String?): List<Header> { fun headerEntries(vararg elements: String?): List<Header> {

16
okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformRule.kt
View File

@@ -17,6 +17,7 @@ package okhttp3.testing
import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider
import com.amazon.corretto.crypto.provider.SelfTestStatus import com.amazon.corretto.crypto.provider.SelfTestStatus
import okhttp3.TestUtil
import okhttp3.internal.platform.ConscryptPlatform import okhttp3.internal.platform.ConscryptPlatform
import okhttp3.internal.platform.Jdk8WithJettyBootPlatform import okhttp3.internal.platform.Jdk8WithJettyBootPlatform
import okhttp3.internal.platform.Jdk9Platform import okhttp3.internal.platform.Jdk9Platform
@@ -121,12 +122,16 @@ open class PlatformRule @JvmOverloads constructor(
} }
fun expectFailureFromJdkVersion(majorVersion: Int) { fun expectFailureFromJdkVersion(majorVersion: Int) {
if (!TestUtil.isGraalVmImage) {
expectFailure(fromMajor(majorVersion)) expectFailure(fromMajor(majorVersion))
} }
}
fun expectFailureOnJdkVersion(majorVersion: Int) { fun expectFailureOnJdkVersion(majorVersion: Int) {
if (!TestUtil.isGraalVmImage) {
expectFailure(onMajor(majorVersion)) expectFailure(onMajor(majorVersion))
} }
}
private fun expectFailure( private fun expectFailure(
versionMatcher: Matcher<out Any>, versionMatcher: Matcher<out Any>,
@@ -202,6 +207,8 @@ open class PlatformRule @JvmOverloads constructor(
fun isBouncyCastle() = getPlatformSystemProperty() == BOUNCYCASTLE_PROPERTY fun isBouncyCastle() = getPlatformSystemProperty() == BOUNCYCASTLE_PROPERTY
fun isGraalVMImage() = TestUtil.isGraalVmImage
fun hasHttp2Support() = !isJdk8() fun hasHttp2Support() = !isJdk8()
fun assumeConscrypt() { fun assumeConscrypt() {
@@ -240,6 +247,10 @@ open class PlatformRule @JvmOverloads constructor(
assumeTrue(Platform.isAndroid) assumeTrue(Platform.isAndroid)
} }
fun assumeGraalVMImage() {
assumeTrue(isGraalVMImage())
}
fun assumeNotConscrypt() { fun assumeNotConscrypt() {
assumeTrue(getPlatformSystemProperty() != CONSCRYPT_PROPERTY) assumeTrue(getPlatformSystemProperty() != CONSCRYPT_PROPERTY)
} }
@@ -283,8 +294,13 @@ open class PlatformRule @JvmOverloads constructor(
assumeFalse(Platform.isAndroid) assumeFalse(Platform.isAndroid)
} }
fun assumeNotGraalVMImage() {
assumeFalse(isGraalVMImage())
}
fun assumeJdkVersion(majorVersion: Int) { fun assumeJdkVersion(majorVersion: Int) {
assumeNotAndroid() assumeNotAndroid()
assumeNotGraalVMImage()
assumeTrue(PlatformVersion.majorVersion == majorVersion) assumeTrue(PlatformVersion.majorVersion == majorVersion)
} }