Browse Source

Install JBR on CI and enable back hot reload tests (#5461)

Install JBR on CI and enable back hot reload tests

## Release Notes
N/A
pull/5457/head v1.10.0-alpha04+dev3147
Nikita Lipsky 2 months ago committed by GitHub
parent
commit
0c6359513c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      ci/docker/linux-tests/Dockerfile
  2. 5
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

10
ci/docker/linux-tests/Dockerfile

@ -43,6 +43,14 @@ RUN apt update -y && \
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
# Install JBR
ARG JBR_DISTR=jbr_jcef-21.0.8-linux-x64-b1163.62
ARG JBR_DISTR_ARCH=$JBR_DISTR.tar.gz
RUN wget https://cache-redirector.jetbrains.com/intellij-jbr/$JBR_DISTR_ARCH && \
tar xzf $JBR_DISTR_ARCH && \
rm $JBR_DISTR_ARCH && \
mv $JBR_DISTR /usr/lib/jvm
# Install Android SDK # Install Android SDK
ENV ANDROID_HOME=/android/sdk ENV ANDROID_HOME=/android/sdk
ARG CMD_TOOLS_VERSION=13114758 ARG CMD_TOOLS_VERSION=13114758
@ -61,7 +69,7 @@ RUN yes | $SDK_MANAGER --licenses && \
ls -1 | grep -v android.jar | xargs rm -rf ls -1 | grep -v android.jar | xargs rm -rf
# Install Google Chrome # Install Google Chrome
ARG CHROME_VERSION="140.0.7339.127-1" ARG CHROME_VERSION="141.0.7390.122-1"
# https://googlechromelabs.github.io/chrome-for-testing/ # https://googlechromelabs.github.io/chrome-for-testing/
ARG CHROME_DRIVER_VERSION="140.0.7339.82" ARG CHROME_DRIVER_VERSION="140.0.7339.82"
ARG CHROME_BIN=/usr/bin/google-chrome-stable ARG CHROME_BIN=/usr/bin/google-chrome-stable

5
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

@ -6,13 +6,11 @@ import org.jetbrains.compose.ComposeBuildConfig
import org.jetbrains.compose.desktop.application.internal.ComposeProperties import org.jetbrains.compose.desktop.application.internal.ComposeProperties
import org.jetbrains.compose.test.utils.GradlePluginTestBase import org.jetbrains.compose.test.utils.GradlePluginTestBase
import org.jetbrains.compose.test.utils.checks import org.jetbrains.compose.test.utils.checks
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.fail import org.junit.jupiter.api.fail
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import kotlin.concurrent.thread import kotlin.concurrent.thread
class HotReloadTest : GradlePluginTestBase() { class HotReloadTest : GradlePluginTestBase() {
@Disabled("TODO: install JBR on CI for the test to pass")
@Test @Test
fun testHotReloadTaskRegisteredInJvmProject() = with(testProject("application/jvm")) { fun testHotReloadTaskRegisteredInJvmProject() = with(testProject("application/jvm")) {
gradle("hotRun", "--dry-run").checks { gradle("hotRun", "--dry-run").checks {
@ -20,7 +18,6 @@ class HotReloadTest : GradlePluginTestBase() {
} }
} }
@Disabled("TODO: install JBR on CI for the test to pass")
@Test @Test
fun testHotReloadTaskRegisteredInKmpProject() = with(testProject("application/mpp")) { fun testHotReloadTaskRegisteredInKmpProject() = with(testProject("application/mpp")) {
gradle("hotRunJvm", "--dry-run").checks { gradle("hotRunJvm", "--dry-run").checks {
@ -49,7 +46,6 @@ class HotReloadTest : GradlePluginTestBase() {
Thread.sleep(1000) Thread.sleep(1000)
} }
@Disabled("TODO: install JBR on CI for the test to pass")
@Test @Test
fun testHotReload() = with(testProject("application/hotReload")) { fun testHotReload() = with(testProject("application/hotReload")) {
var result: BuildResult? = null var result: BuildResult? = null
@ -95,7 +91,6 @@ class HotReloadTest : GradlePluginTestBase() {
gradleRunnerWorkaround() gradleRunnerWorkaround()
} }
@Disabled("TODO: install JBR on CI for the test to pass")
@Test @Test
fun testExternalHotReload() = with(testProject("application/mpp")) { fun testExternalHotReload() = with(testProject("application/mpp")) {
val externalHotReloadVersion = "1.0.0-rc01" val externalHotReloadVersion = "1.0.0-rc01"

Loading…
Cancel
Save