android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-08-07 12:42:57 +03:00
Code Releases Activity

Fix for native image and assumptions (#6414)

Browse Source
This commit is contained in:
Yuri Schimke
2020-11-13 03:09:53 +00:00
committed by GitHub
parent 205a0bc0be
commit b1ee602958
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import okhttp3.internal.platform.Jdk8WithJettyBootPlatform
import okhttp3.internal.platform.Jdk9Platform import okhttp3.internal.platform.Jdk9Platform
import okhttp3.internal.platform.OpenJSSEPlatform import okhttp3.internal.platform.OpenJSSEPlatform
import okhttp3.internal.platform.Platform import okhttp3.internal.platform.Platform
import org.assertj.core.api.Assumptions.assumeThat
import org.bouncycastle.jce.provider.BouncyCastleProvider import org.bouncycastle.jce.provider.BouncyCastleProvider
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
import org.conscrypt.Conscrypt import org.conscrypt.Conscrypt
@@ -33,6 +32,9 @@ import org.hamcrest.Matcher
import org.hamcrest.StringDescription import org.hamcrest.StringDescription
import org.hamcrest.TypeSafeMatcher import org.hamcrest.TypeSafeMatcher
import org.junit.jupiter.api.Assertions.fail import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Assumptions
import org.junit.jupiter.api.Assumptions.assumeFalse
import org.junit.jupiter.api.Assumptions.assumeTrue
import org.junit.jupiter.api.extension.AfterEachCallback import org.junit.jupiter.api.extension.AfterEachCallback
import org.junit.jupiter.api.extension.BeforeEachCallback import org.junit.jupiter.api.extension.BeforeEachCallback
import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.extension.ExtensionContext
@@ -116,7 +118,7 @@ open class PlatformRule @JvmOverloads constructor(
fun setupPlatform() { fun setupPlatform() {
if (requiredPlatformName != null) { if (requiredPlatformName != null) {
assumeThat(getPlatformSystemProperty()).isEqualTo(requiredPlatformName) assumeTrue(getPlatformSystemProperty() == requiredPlatformName)
} }
if (platform != null) { if (platform != null) {
@@ -233,86 +235,86 @@ open class PlatformRule @JvmOverloads constructor(
fun hasHttp2Support() = !isJdk8() fun hasHttp2Support() = !isJdk8()
fun assumeConscrypt() { fun assumeConscrypt() {
assumeThat(getPlatformSystemProperty()).isEqualTo(CONSCRYPT_PROPERTY) assumeTrue(getPlatformSystemProperty() == CONSCRYPT_PROPERTY)
} }
fun assumeJdk9() { fun assumeJdk9() {
assumeThat(getPlatformSystemProperty()).isEqualTo(JDK9_PROPERTY) assumeTrue(getPlatformSystemProperty() == JDK9_PROPERTY)
} }
fun assumeOpenJSSE() { fun assumeOpenJSSE() {
assumeThat(getPlatformSystemProperty()).isEqualTo(OPENJSSE_PROPERTY) assumeTrue(getPlatformSystemProperty() == OPENJSSE_PROPERTY)
} }
fun assumeJdk8() { fun assumeJdk8() {
assumeThat(getPlatformSystemProperty()).isEqualTo(JDK8_PROPERTY) assumeTrue(getPlatformSystemProperty() == JDK8_PROPERTY)
} }
fun assumeJdk8Alpn() { fun assumeJdk8Alpn() {
assumeThat(getPlatformSystemProperty()).isEqualTo(JDK8_ALPN_PROPERTY) assumeTrue(getPlatformSystemProperty() == JDK8_ALPN_PROPERTY)
} }
fun assumeCorretto() { fun assumeCorretto() {
assumeThat(getPlatformSystemProperty()).isEqualTo(CORRETTO_PROPERTY) assumeTrue(getPlatformSystemProperty() == CORRETTO_PROPERTY)
} }
fun assumeBouncyCastle() { fun assumeBouncyCastle() {
assumeThat(getPlatformSystemProperty()).isEqualTo(BOUNCYCASTLE_PROPERTY) assumeTrue(getPlatformSystemProperty() == BOUNCYCASTLE_PROPERTY)
} }
fun assumeHttp2Support() { fun assumeHttp2Support() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(JDK8_PROPERTY) assumeTrue(getPlatformSystemProperty() != JDK8_PROPERTY)
} }
fun assumeAndroid() { fun assumeAndroid() {
assumeThat(Platform.isAndroid).isTrue assumeTrue(Platform.isAndroid)
} }
fun assumeNotConscrypt() { fun assumeNotConscrypt() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(CONSCRYPT_PROPERTY) assumeTrue(getPlatformSystemProperty() != CONSCRYPT_PROPERTY)
} }
fun assumeNotJdk9() { fun assumeNotJdk9() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(JDK9_PROPERTY) assumeTrue(getPlatformSystemProperty() != JDK9_PROPERTY)
} }
fun assumeNotJdk8() { fun assumeNotJdk8() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(JDK8_PROPERTY) assumeTrue(getPlatformSystemProperty() != JDK8_PROPERTY)
} }
fun assumeNotJdk8Alpn() { fun assumeNotJdk8Alpn() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(JDK8_ALPN_PROPERTY) assumeTrue(getPlatformSystemProperty() != JDK8_ALPN_PROPERTY)
} }
fun assumeNotOpenJSSE() { fun assumeNotOpenJSSE() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(OPENJSSE_PROPERTY) assumeTrue(getPlatformSystemProperty() != OPENJSSE_PROPERTY)
} }
fun assumeNotCorretto() { fun assumeNotCorretto() {
assumeThat(getPlatformSystemProperty()).isNotEqualTo(CORRETTO_PROPERTY) assumeTrue(getPlatformSystemProperty() != CORRETTO_PROPERTY)
} }
fun assumeNotBouncyCastle() { fun assumeNotBouncyCastle() {
// Most failures are with MockWebServer // Most failures are with MockWebServer
// org.bouncycastle.tls.TlsFatalAlertReceived: handshake_failure(40) // org.bouncycastle.tls.TlsFatalAlertReceived: handshake_failure(40)
// at org.bouncycastle.tls.TlsProtocol.handleAlertMessage(TlsProtocol.java:241) // at org.bouncycastle.tls.TlsProtocol.handleAlertMessage(TlsProtocol.java:241)
assumeThat(getPlatformSystemProperty()).isNotEqualTo(BOUNCYCASTLE_PROPERTY) assumeTrue(getPlatformSystemProperty() != BOUNCYCASTLE_PROPERTY)
} }
fun assumeNotHttp2Support() { fun assumeNotHttp2Support() {
assumeThat(getPlatformSystemProperty()).isEqualTo(JDK8_PROPERTY) assumeTrue(getPlatformSystemProperty() == JDK8_PROPERTY)
} }
fun assumeJettyBootEnabled() { fun assumeJettyBootEnabled() {
assumeThat(isAlpnBootEnabled()).isTrue assumeTrue(isAlpnBootEnabled())
} }
fun assumeNotAndroid() { fun assumeNotAndroid() {
assumeThat(Platform.isAndroid).isFalse assumeFalse(Platform.isAndroid)
} }
fun assumeJdkVersion(majorVersion: Int) { fun assumeJdkVersion(majorVersion: Int) {
assumeThat(PlatformVersion.majorVersion).isEqualTo(majorVersion) assumeTrue(PlatformVersion.majorVersion == majorVersion)
} }
companion object { companion object {