From d9107c2eedbdacb8711a92bc955d263d28fe0413 Mon Sep 17 00:00:00 2001 From: tvallin Date: Wed, 13 Nov 2024 14:25:57 +0100 Subject: [PATCH] Add packaging tests on windows --- .github/workflows/validate.yml | 4 ++-- .../tests/integration/packaging/inject/InjectJlinkTestIT.java | 4 ++++ .../tests/integration/packaging/mp1/Mp1JlinkTestIT.java | 3 +++ .../tests/integration/packaging/mp3/Mp3JlinkTestIT.java | 4 ++++ .../tests/integration/packaging/se1/Se1JlinkTestIT.java | 4 ++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index f9f9da03e1f..e4dca2b00f2 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -315,12 +315,12 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ ubuntu-20.04, macos-14 ] + os: [ ubuntu-20.04, macos-14, windows-2022 ] packaging: [ jar, jlink ] include: - { os: ubuntu-20.04, platform: linux } - { os: macos-14, platform: macos } -# - { os: windows-2022, platform: windows } + - { os: windows-2022, platform: windows } runs-on: ${{ matrix.os }} name: tests/packaging-${{ matrix.packaging }}-${{ matrix.platform }} steps: diff --git a/tests/integration/packaging/inject/src/test/java/io/helidon/tests/integration/packaging/inject/InjectJlinkTestIT.java b/tests/integration/packaging/inject/src/test/java/io/helidon/tests/integration/packaging/inject/InjectJlinkTestIT.java index 8516a4bfd15..6d955360d69 100644 --- a/tests/integration/packaging/inject/src/test/java/io/helidon/tests/integration/packaging/inject/InjectJlinkTestIT.java +++ b/tests/integration/packaging/inject/src/test/java/io/helidon/tests/integration/packaging/inject/InjectJlinkTestIT.java @@ -18,6 +18,8 @@ import io.helidon.tests.integration.harness.ProcessRunner.ExecMode; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; class InjectJlinkTestIT extends InjectPackagingTestIT { @@ -27,11 +29,13 @@ ExecMode execMode() { } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testExitOnStarted() { doTestExitOnStarted(); } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testWebClientService() { doTestWebClientService(); } diff --git a/tests/integration/packaging/mp-1/src/test/java/io/helidon/tests/integration/packaging/mp1/Mp1JlinkTestIT.java b/tests/integration/packaging/mp-1/src/test/java/io/helidon/tests/integration/packaging/mp1/Mp1JlinkTestIT.java index 4990051f946..1e487c05b9d 100644 --- a/tests/integration/packaging/mp-1/src/test/java/io/helidon/tests/integration/packaging/mp1/Mp1JlinkTestIT.java +++ b/tests/integration/packaging/mp-1/src/test/java/io/helidon/tests/integration/packaging/mp1/Mp1JlinkTestIT.java @@ -18,6 +18,8 @@ import io.helidon.tests.integration.harness.ProcessRunner.ExecMode; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; class Mp1JlinkTestIT extends Mp1PackagingTestIT { @@ -27,6 +29,7 @@ ExecMode execMode() { } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testApp() { doTestApp(); } diff --git a/tests/integration/packaging/mp-3/src/test/java/io/helidon/tests/integration/packaging/mp3/Mp3JlinkTestIT.java b/tests/integration/packaging/mp-3/src/test/java/io/helidon/tests/integration/packaging/mp3/Mp3JlinkTestIT.java index 035d5a1a533..6e760b72cf2 100644 --- a/tests/integration/packaging/mp-3/src/test/java/io/helidon/tests/integration/packaging/mp3/Mp3JlinkTestIT.java +++ b/tests/integration/packaging/mp-3/src/test/java/io/helidon/tests/integration/packaging/mp3/Mp3JlinkTestIT.java @@ -18,6 +18,8 @@ import io.helidon.tests.integration.harness.ProcessRunner.ExecMode; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; class Mp3JlinkTestIT extends Mp3PackagingTestIT { @@ -27,11 +29,13 @@ ExecMode execMode() { } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testExitOnStarted() { doTestExitOnStarted(); } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testGreetResource() { doTestGreetResource(); } diff --git a/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1JlinkTestIT.java b/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1JlinkTestIT.java index f5fbd612518..92cd7bf5dc1 100644 --- a/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1JlinkTestIT.java +++ b/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1JlinkTestIT.java @@ -18,6 +18,8 @@ import io.helidon.tests.integration.harness.ProcessRunner.ExecMode; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; class Se1JlinkTestIT extends Se1PackagingTestIT { @@ -27,11 +29,13 @@ ExecMode execMode() { } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testExitOnStarted() { doTestExitOnStarted(); } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application") void testWebClientService() { doTestWebClientService(); }