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 for conscrypt tests (#5263)

Browse Source
This commit is contained in:
Yuri Schimke
2019-07-03 07:20:28 +01:00
committed by GitHub
parent 83361312e8
commit 16b7e36968
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp-testing-support/src/main/java/okhttp3/testing/PlatformRule.kt
View File

@@ -259,8 +259,7 @@ open class PlatformRule @JvmOverloads constructor(
} }
@JvmStatic @JvmStatic
fun conscrypt() = PlatformRule( fun conscrypt() = PlatformRule(CONSCRYPT_PROPERTY)
CONSCRYPT_PROPERTY)
@JvmStatic @JvmStatic
fun jdk9() = PlatformRule(JDK9_PROPERTY) fun jdk9() = PlatformRule(JDK9_PROPERTY)
@@ -269,8 +268,7 @@ open class PlatformRule @JvmOverloads constructor(
fun jdk8() = PlatformRule(JDK8_PROPERTY) fun jdk8() = PlatformRule(JDK8_PROPERTY)
@JvmStatic @JvmStatic
fun jdk8alpn() = PlatformRule( fun jdk8alpn() = PlatformRule(JDK8_ALPN_PROPERTY)
JDK8_ALPN_PROPERTY)
@JvmStatic @JvmStatic
fun isAlpnBootEnabled(): Boolean = try { fun isAlpnBootEnabled(): Boolean = try {

1
okhttp/src/test/java/okhttp3/CallTest.java
View File

@@ -96,7 +96,6 @@ import static okhttp3.internal.Internal.addHeaderLenient;
import static okhttp3.tls.internal.TlsUtil.localhost; import static okhttp3.tls.internal.TlsUtil.localhost;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.data.Offset.offset; import static org.assertj.core.data.Offset.offset;
import static org.hamcrest.CoreMatchers.anything;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeFalse;

13
okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
View File

@@ -37,6 +37,7 @@ import okhttp3.Response;
import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockWebServer;
import okhttp3.testing.PlatformRule; import okhttp3.testing.PlatformRule;
import okhttp3.testing.PlatformVersion;
import okhttp3.tls.HandshakeCertificates; import okhttp3.tls.HandshakeCertificates;
import okhttp3.tls.HeldCertificate; import okhttp3.tls.HeldCertificate;
import org.junit.Before; import org.junit.Before;
@@ -195,10 +196,10 @@ public final class ClientAuthTest {
fail(); fail();
} catch (SSLHandshakeException expected) { } catch (SSLHandshakeException expected) {
} catch (SSLException expected) { } catch (SSLException expected) {
String jvmVersion = System.getProperty("java.specification.version"); assertThat(PlatformVersion.INSTANCE.getMajorVersion()).isGreaterThanOrEqualTo(11);
assertThat(jvmVersion).matches("1[123]");
} catch (SocketException expected) { } catch (SocketException expected) {
assertThat(getPlatformSystemProperty()).isEqualTo("jdk9"); assertThat(getPlatformSystemProperty()).isIn(PlatformRule.JDK9_PROPERTY,
PlatformRule.CONSCRYPT_PROPERTY);
} }
} }
@@ -250,10 +251,10 @@ public final class ClientAuthTest {
} catch (SSLHandshakeException expected) { } catch (SSLHandshakeException expected) {
} catch (SSLException expected) { } catch (SSLException expected) {
// javax.net.ssl.SSLException: readRecord // javax.net.ssl.SSLException: readRecord
String jvmVersion = System.getProperty("java.specification.version"); assertThat(PlatformVersion.INSTANCE.getMajorVersion()).isGreaterThanOrEqualTo(11);
assertThat(jvmVersion).matches("1[123]");
} catch (SocketException expected) { } catch (SocketException expected) {
assertThat(getPlatformSystemProperty()).isEqualTo("jdk9"); assertThat(getPlatformSystemProperty()).isIn(PlatformRule.JDK9_PROPERTY,
PlatformRule.CONSCRYPT_PROPERTY);
} }
} }