Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CI tests for Loom #7613

Merged
merged 4 commits into from
Jan 2, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/build.yml
Expand Up @@ -413,6 +413,27 @@ jobs:
env:
API_LEVEL: ${{ matrix.api-level }}

testloom:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'loom')

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Configure JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11

- name: Run Checks
uses: gradle/gradle-build-action@v2
with:
arguments: jvmTest -Dokhttp.platform=loom -Dtest.java.version=19


testandroidregression:
runs-on: macos-latest
Expand Down
7 changes: 7 additions & 0 deletions build.gradle.kts
Expand Up @@ -140,6 +140,13 @@ subprojects {
"-XX:+HeapDumpOnOutOfMemoryError"
)

if (platform == "loom") {
jvmArgs = jvmArgs!! + listOf(
"-Djdk.tracePinnedThread=full",
"--enable-preview"
)
}

val javaToolchains = project.extensions.getByType<JavaToolchainService>()
javaLauncher.set(javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion))
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Expand Up @@ -32,7 +32,7 @@ conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref =
conscrypt-openjdk = { module = "org.conscrypt:conscrypt-openjdk-uber", version.ref = "org-conscrypt" }
eclipseOsgi = "org.eclipse.platform:org.eclipse.osgi:3.18.200"
findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
gradlePlugin-android = "com.android.tools.build:gradle:7.2.2"
gradlePlugin-android = "com.android.tools.build:gradle:7.4.0-rc03"
yschimke marked this conversation as resolved.
Show resolved Hide resolved
gradlePlugin-androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1"
gradlePlugin-animalsniffer = "ru.vyarus:gradle-animalsniffer-plugin:1.6.0"
gradlePlugin-binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-all.zip
yschimke marked this conversation as resolved.
Show resolved Hide resolved
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Expand Up @@ -214,6 +214,8 @@ open class PlatformRule @JvmOverloads constructor(

fun isOpenJsse() = getPlatformSystemProperty() == OPENJSSE_PROPERTY

fun isLoom() = getPlatformSystemProperty() == LOOM_PROPERTY

fun isGraalVMImage() = TestUtil.isGraalVmImage

fun hasHttp2Support() = !isJdk8()
Expand Down Expand Up @@ -250,6 +252,10 @@ open class PlatformRule @JvmOverloads constructor(
assumeTrue(getPlatformSystemProperty() == OPENJSSE_PROPERTY)
}

fun assumeLoom() {
assumeTrue(getPlatformSystemProperty() == LOOM_PROPERTY)
}

fun assumeHttp2Support() {
assumeTrue(getPlatformSystemProperty() != JDK8_PROPERTY)
}
Expand Down Expand Up @@ -282,6 +288,10 @@ open class PlatformRule @JvmOverloads constructor(
assumeTrue(getPlatformSystemProperty() != OPENJSSE_PROPERTY)
}

fun assumeNotLoom() {
assumeTrue(getPlatformSystemProperty() != LOOM_PROPERTY)
}

fun assumeNotCorretto() {
assumeTrue(getPlatformSystemProperty() != CORRETTO_PROPERTY)
}
Expand Down Expand Up @@ -346,6 +356,7 @@ open class PlatformRule @JvmOverloads constructor(
const val JDK8_PROPERTY = "jdk8"
const val OPENJSSE_PROPERTY = "openjsse"
const val BOUNCYCASTLE_PROPERTY = "bouncycastle"
const val LOOM_PROPERTY = "loom"

/**
* For whatever reason our BouncyCastle provider doesn't work with ECDSA keys. Just configure it
Expand Down
72 changes: 72 additions & 0 deletions okhttp/src/jvmTest/java/okhttp3/LoomTest.kt
@@ -0,0 +1,72 @@
/*
* Copyright (C) 2018 Square, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package okhttp3

import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import mockwebserver3.MockResponse
import mockwebserver3.MockWebServer
import okhttp3.testing.PlatformRule
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.RegisterExtension

class LoomTest {
@JvmField
@RegisterExtension
val platform = PlatformRule()
@JvmField
@RegisterExtension
val clientTestRule = OkHttpClientTestRule()

private lateinit var server: MockWebServer

private lateinit var client: OkHttpClient

@BeforeEach
fun setUp(
server: MockWebServer,
) {
platform.assumeLoom()

this.server = server

client = clientTestRule.newClientBuilder()
.dispatcher(Dispatcher(newVirtualThreadPerTaskExecutor()))
.build()
}

private fun newVirtualThreadPerTaskExecutor(): ExecutorService {
return Executors::class.java.getMethod("newVirtualThreadPerTaskExecutor").invoke(null) as ExecutorService
}

@Test
fun testRequest() {
server.enqueue(MockResponse())

val request = Request(server.url("/"))

client.newCall(request).execute().use {
assertThat(it.code).isEqualTo(200)
}
}

@Test
fun testIfSupported() {
assertThat(platform.isLoom()).isTrue()
}
}