aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSamruddhi Khandale <skhandale@microsoft.com>2022-09-24 00:25:58 +0300
committerGitHub <noreply@github.com>2022-09-24 00:25:58 +0300
commit3a28652790def9f3172561fa2907191bf5c0cab0 (patch)
tree24cd5a658ddb047f833a4a3a24a2683bb88fdf6e /test
parentceb4544cc38d4882a0294c79f4ef8123435cb027 (diff)
Java: add jdkDistro option (#172)
* add jdkDistro option * bump version
Diffstat (limited to 'test')
-rw-r--r--test/java/install_additional_java.sh2
-rw-r--r--test/java/install_from_non_default_distro.sh11
-rw-r--r--test/java/scenarios.json11
3 files changed, 22 insertions, 2 deletions
diff --git a/test/java/install_additional_java.sh b/test/java/install_additional_java.sh
index a796fee..fcfd6bd 100644
--- a/test/java/install_additional_java.sh
+++ b/test/java/install_additional_java.sh
@@ -5,7 +5,7 @@ set -e
# Optional: Import test library
source dev-container-features-test-lib
-check "java version 17 installed as default" java --version | grep 17
+check "java version 18 installed as default" java --version | grep 18
check "java version 11 installed" ls /usr/local/sdkman/candidates/java | grep 11
check "java version 8 installed" ls /usr/local/sdkman/candidates/java | grep 8
diff --git a/test/java/install_from_non_default_distro.sh b/test/java/install_from_non_default_distro.sh
new file mode 100644
index 0000000..e45f9dd
--- /dev/null
+++ b/test/java/install_from_non_default_distro.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version 18 installed as default" java --version | grep 18
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 82e0795..eec7ba5 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -1,9 +1,18 @@
{
+ "install_from_non_default_distro": {
+ "image": "ubuntu:focal",
+ "features": {
+ "java": {
+ "version": "18",
+ "jdkDistro": "open"
+ }
+ }
+ },
"install_additional_java": {
"image": "ubuntu:focal",
"features": {
"java": {
- "version": "17",
+ "version": "18",
"additionalVersions": "11,8"
}
}