From f82307ad60514d1e912a9aa2b64204721fe955eb Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 23 Aug 2022 17:23:21 -0400
Subject: test updates to adopt https://github.com/devcontainers/cli/pull/124
 (#114)

* test updates to adopt https://github.com/devcontainers/cli/pull/124

* remove accidental tgz check in

* typo in option

* typo in python install script on dotnet6/jammy branch

* no scenarios

* code review and test name

* Delete install_os_provided_python.sh
---
 test/java/install_additional_java.sh  | 13 +++++++++++++
 test/java/install_gradle_and_maven.sh | 13 +++++++++++++
 test/java/scenarios.json              | 21 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 test/java/install_additional_java.sh
 create mode 100644 test/java/install_gradle_and_maven.sh
 create mode 100644 test/java/scenarios.json

(limited to 'test/java')

diff --git a/test/java/install_additional_java.sh b/test/java/install_additional_java.sh
new file mode 100644
index 0000000..a796fee
--- /dev/null
+++ b/test/java/install_additional_java.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+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 11 installed"  ls /usr/local/sdkman/candidates/java  | grep 11
+check "java version 8 installed"  ls /usr/local/sdkman/candidates/java | grep 8
+
+# Report result
+reportResults
diff --git a/test/java/install_gradle_and_maven.sh b/test/java/install_gradle_and_maven.sh
new file mode 100644
index 0000000..a81dd9e
--- /dev/null
+++ b/test/java/install_gradle_and_maven.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java" java --version
+check "gradle" gradle --version
+check "maven" mvn --version
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
new file mode 100644
index 0000000..659a857
--- /dev/null
+++ b/test/java/scenarios.json
@@ -0,0 +1,21 @@
+{
+    "install_additional_java": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "17",
+                "additionalVersions": "11,8"
+            }
+        }
+    },
+    "install_gradle_and_maven": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "latest",
+                "installGradle": true,
+                "installMaven": true
+            }
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3