-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds minJDK and maxJDK to IfMandrelVersion annotation
Tested examples:
```java
@test
@tag("jdkVersionTest")
@order(1)
@IfMandrelVersion(min = "21.3.1")
public void jdkVersionCheckA(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(2)
@IfMandrelVersion(min = "21.3.1", minJDK = "17")
public void jdkVersionCheckB(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(3)
@IfMandrelVersion(min = "22", minJDK = "17")
public void jdkVersionCheckC(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(4)
@IfMandrelVersion(min = "22", minJDK = "17.0.2")
public void jdkVersionCheckD(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(5)
@IfMandrelVersion(min = "22", minJDK = "17", maxJDK = "17.0.2")
public void jdkVersionCheckE(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(6)
@IfMandrelVersion(min = "21", minJDK = "11.0.12", maxJDK = "17.0.1")
public void jdkVersionCheckF(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
@test
@tag("jdkVersionTest")
@order(7)
@IfMandrelVersion(min = "21", maxJDK = "11")
public void jdkVersionCheckG(TestInfo testInfo) {
System.out.println("KARM Running test "+testInfo.getTestMethod());
}
```
Adds VersionTests- Loading branch information
Showing
8 changed files
with
242 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
testsuite/src/it/java/org/graalvm/tests/integration/utils/versions/VersionsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package org.graalvm.tests.integration.utils.versions;/* | ||
| * Copyright (c) 2022, Red Hat Inc. All rights reserved. | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| import org.graalvm.tests.integration.utils.Logs; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Order; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInfo; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.StandardOpenOption; | ||
| import java.nio.file.attribute.PosixFilePermissions; | ||
|
|
||
| import static org.graalvm.tests.integration.utils.Commands.IS_THIS_WINDOWS; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| /** | ||
| * Testing test suite... | ||
| * | ||
| * A fake native-image executable script is created, it contains a single version string. | ||
| * Using the property FAKE_NATIVE_IMAGE_DIR, the test suite is tricked into running it | ||
| * during native-image version resolution. | ||
| * A series of test methods is executed by JUnit, business as usual. Those test methods log | ||
| * their executing into a file. | ||
| * After all tests are done, the file is examined. If it contains any superfluous entries | ||
| * or if it's missing anything, the test lass fails. | ||
| */ | ||
| @Tag("testing-testsuite") | ||
| public class VersionsTest { | ||
| static final Path NATIVE_IMAGE = Path.of(System.getProperty("java.io.tmpdir"), IS_THIS_WINDOWS ? "native-image.cmd" : "native-image"); | ||
| static final String VERSION = "native-image 22.2.0-devdb26f5c4fbe Mandrel Distribution (Java Version 17.0.3-beta+5-202203292328)"; | ||
| static final Path LOG = Path.of(System.getProperty("java.io.tmpdir"), "versions-log"); | ||
| static final StandardOpenOption[] LOG_FILE_OPS = new StandardOpenOption[]{StandardOpenOption.CREATE, StandardOpenOption.APPEND, StandardOpenOption.WRITE}; | ||
|
|
||
| @BeforeAll | ||
| public static void setup() throws IOException { | ||
| System.setProperty("FAKE_NATIVE_IMAGE_DIR", System.getProperty("java.io.tmpdir") + File.separator); | ||
| Files.writeString(NATIVE_IMAGE, IS_THIS_WINDOWS ? | ||
| "@echo off" + System.lineSeparator() + | ||
| "echo " + VERSION + System.lineSeparator() : | ||
| "#!/bin/sh" + System.lineSeparator() + | ||
| "echo '" + VERSION + "'" + System.lineSeparator(), | ||
| StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); | ||
| if(!IS_THIS_WINDOWS) { | ||
| Files.setPosixFilePermissions(NATIVE_IMAGE, PosixFilePermissions.fromString("rwxr-xr-x")); | ||
| } | ||
| Files.deleteIfExists(LOG); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void teardown() throws IOException { | ||
| System.clearProperty("FAKE_NATIVE_IMAGE_DIR"); | ||
| Files.deleteIfExists(NATIVE_IMAGE); | ||
| final String testlog = Files.readString(LOG, StandardCharsets.UTF_8); | ||
| try { | ||
| assertEquals( | ||
| "Running test jdkVersionCheckA\n" + | ||
| "Running test jdkVersionCheckB\n" + | ||
| "Running test jdkVersionCheckC\n" + | ||
| "Running test jdkVersionCheckD\n" + | ||
| "Running test jdkVersionCheckI\n", testlog); | ||
| } finally { | ||
| Logs.archiveLog(VersionsTest.class.getCanonicalName(), "versionTest", LOG.toFile()); | ||
| Files.deleteIfExists(LOG); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| @Order(1) | ||
| @IfMandrelVersion(min = "21.3.1") | ||
| public void jdkVersionCheckA(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(2) | ||
| @IfMandrelVersion(min = "21.3.1", minJDK = "17") | ||
| public void jdkVersionCheckB(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(3) | ||
| @IfMandrelVersion(min = "22", minJDK = "17") | ||
| public void jdkVersionCheckC(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(4) | ||
| @IfMandrelVersion(min = "22", minJDK = "17.0.2") | ||
| public void jdkVersionCheckD(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(5) | ||
| @IfMandrelVersion(min = "22", minJDK = "17", maxJDK = "17.0.2") | ||
| public void jdkVersionCheckE(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(6) | ||
| @IfMandrelVersion(min = "21", minJDK = "11.0.12", maxJDK = "17.0.1") | ||
| public void jdkVersionCheckF(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(7) | ||
| @IfMandrelVersion(min = "21", maxJDK = "11") | ||
| public void jdkVersionCheckG(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(8) | ||
| @IfMandrelVersion(min = "21.2", minJDK = "18.0.0") | ||
| public void jdkVersionCheckH(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| @Test | ||
| @Order(9) | ||
| @IfMandrelVersion(min = "22", max = "22.2", minJDK = "17.0.1", maxJDK = "17.0.3") | ||
| public void jdkVersionCheckI(TestInfo testInfo) throws IOException { | ||
| Files.writeString(LOG, "Running test " + testInfo.getTestMethod().get().getName() + "\n", StandardCharsets.UTF_8, LOG_FILE_OPS); | ||
| } | ||
|
|
||
| } |