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

Reduce platform logging for each test (#5723)

Browse Source
This commit is contained in:
Yuri Schimke
2020-01-12 23:44:34 +00:00
committed by GitHub
parent 0dbea31ca1
commit bcfa004b6a
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,8 +63,6 @@ open class PlatformRule @JvmOverloads constructor(
try {
setupPlatform()
System.err.println("Running with ${Platform.get().javaClass.simpleName}")
base.evaluate()
} catch (e: AssumptionViolatedException) {
throw e
@@ -91,6 +89,10 @@ open class PlatformRule @JvmOverloads constructor(
} else {
Platform.resetForTests()
}
if (requiredPlatformName != null) {
System.err.println("Running with ${Platform.get().javaClass.simpleName}")
}
}
fun resetPlatform() {
@@ -288,43 +290,46 @@ open class PlatformRule @JvmOverloads constructor(
const val BOUNCYCASTLE_PROPERTY = "bouncycastle"
init {
if (getPlatformSystemProperty() == CONSCRYPT_PROPERTY && Security.getProviders()[0].name != "Conscrypt") {
val platformSystemProperty = getPlatformSystemProperty()
if (platformSystemProperty == CONSCRYPT_PROPERTY && Security.getProviders()[0].name != "Conscrypt") {
if (!Conscrypt.isAvailable()) {
System.err.println("Warning: Conscrypt not available")
}
val provider = Conscrypt.newProviderBuilder().provideTrustManager(true).build()
Security.insertProviderAt(provider, 1)
} else if (getPlatformSystemProperty() == JDK8_ALPN_PROPERTY) {
} else if (platformSystemProperty == JDK8_ALPN_PROPERTY) {
if (!isAlpnBootEnabled()) {
System.err.println("Warning: ALPN Boot not enabled")
}
} else if (getPlatformSystemProperty() == JDK8_PROPERTY) {
} else if (platformSystemProperty == JDK8_PROPERTY) {
if (isAlpnBootEnabled()) {
System.err.println("Warning: ALPN Boot enabled unintentionally")
}
} else if (getPlatformSystemProperty() == OPENJSSE_PROPERTY && Security.getProviders()[0].name != "OpenJSSE") {
} else if (platformSystemProperty == OPENJSSE_PROPERTY && Security.getProviders()[0].name != "OpenJSSE") {
if (!OpenJSSEPlatform.isSupported) {
System.err.println("Warning: OpenJSSE not available")
}
Security.insertProviderAt(OpenJSSE(), 1)
} else if (getPlatformSystemProperty() == BOUNCYCASTLE_PROPERTY && Security.getProviders()[0].name != "BC") {
} else if (platformSystemProperty == BOUNCYCASTLE_PROPERTY && Security.getProviders()[0].name != "BC") {
Security.insertProviderAt(BouncyCastleProvider(), 1)
Security.insertProviderAt(BouncyCastleJsseProvider(), 2)
} else if (getPlatformSystemProperty() == CORRETTO_PROPERTY) {
} else if (platformSystemProperty == CORRETTO_PROPERTY) {
AmazonCorrettoCryptoProvider.install()
AmazonCorrettoCryptoProvider.INSTANCE.assertHealthy()
}
Platform.resetForTests()
System.err.println("Running Tests with ${Platform.get().javaClass.simpleName}")
}
@JvmStatic
fun getPlatformSystemProperty(): String {
var property: String? = System.getProperty(
PROPERTY_NAME)
var property: String? = System.getProperty(PROPERTY_NAME)
if (property == null) {
property = when (Platform.get()) {