Attempt to fix unit tests

heroku · May 17, 2024 · 29ef9a2 · 29ef9a2
1 parent ef788fa
commit 29ef9a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,6 +104,7 @@ jobs:
     needs: lint
     container:
       image: "${{ fromJson('{ \"heroku-20\": \"heroku/heroku:20\", \"heroku-22\": \"heroku/heroku:22\", \"heroku-24\": \"heroku/heroku:24\" }')[matrix.stack] }}"
+      options: --user root
       env:
         STACK: ${{ matrix.stack }}
     strategy:

diff --git a/test/v2 b/test/v2
@@ -130,13 +130,13 @@ test_installJavaCI() {
 
 test_installJavaWithVersion() {
   unset JAVA_HOME # unsets environment -- shunit doesn't clean environment before each test
-  capture install_java "${BUILD_DIR}" "1.8.0_332"
+  capture install_java "${BUILD_DIR}" "1.8.0_412"
   assertTrue "A .jdk directory should be created when installing java." "[ -d ${BUILD_DIR}/.jdk ]"
   assertTrue "The java runtime should be present." "[ -f ${BUILD_DIR}/.jdk/bin/java ]"
   assertEquals "${BUILD_DIR}/.jdk" "${JAVA_HOME}"
   assertContains "${PATH}" "${BUILD_DIR}/.jdk/bin"
   assertTrue "A version file should have been created." "[ -f ${BUILD_DIR}/.jdk/version ]"
-  assertEquals "$(cat "${BUILD_DIR}/.jdk/version")" "1.8.0_332"
+  assertEquals "$(cat "${BUILD_DIR}/.jdk/version")" "1.8.0_412"
   assertEquals "${BUILD_DIR}/.jdk/bin/java" "$(command -v java)"
   assertTrue "A profile.d file should have been created." "[ -f ${BUILD_DIR}/.profile.d/jvmcommon.sh ]"
 }
@@ -194,17 +194,17 @@ test_invalidJdkURL() {
 }
 
 test_customJdk() {
-  capture install_java "${BUILD_DIR}" "1.8.0_332"
+  capture install_java "${BUILD_DIR}" "1.8.0_412"
   assertCapturedSuccess
 }
 
 test_zuluJdk() {
-  capture install_java "${BUILD_DIR}" "zulu-1.8.0_332"
+  capture install_java "${BUILD_DIR}" "zulu-1.8.0_412"
   assertCapturedSuccess
 }
 
 test_openJdk() {
-  capture install_java "${BUILD_DIR}" "openjdk-1.8.0_332"
+  capture install_java "${BUILD_DIR}" "openjdk-1.8.0_412"
   assertCapturedSuccess
 }
 
@@ -231,49 +231,38 @@ test_install_jdk_invalid() {
 
   curl -sf --retry 3 --retry-connrefused --connect-timeout 5 -o "${key}" -L "https://www.php.net/distributions/php-keyring.gpg"
   export HEROKU_GPG_VALIDATION=1
-  capture install_jdk "${JDK_BASE_URL}/openjdk11.0.8.tar.gz" "$(mktemp -d)" "${BUILDPACK_HOME}" "${key}"
+  capture install_jdk "${JDK_BASE_URL}/openjdk11.0.23.tar.gz" "$(mktemp -d)" "${BUILDPACK_HOME}" "${key}"
   assertCapturedError " !     ERROR: Invalid GPG signature!"
   unset HEROKU_GPG_VALIDATION
 }
 
 test_get_jdk_url_with_default() {
   if [ "${STACK}" == "heroku-20" ]; then
-    assertEquals "${JDK_BASE_URL:?}/openjdk1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
+    assertEquals "${JDK_BASE_URL:?}/openjdk1.8.0_412.tar.gz" "$(_get_jdk_url_with_default "1.8.0_412")"
 
     export JDK_URL_1_8="https://example.com/java8"
-    assertEquals "${JDK_URL_1_8}" "$(_get_jdk_url_with_default "1.8.0_332")"
-    assertEquals "${JDK_BASE_URL:?}/openjdk1.7.0_272.tar.gz" "$(_get_jdk_url_with_default "1.7.0_272")"
-    assertEquals "${JDK_BASE_URL:?}/openjdk11.0.8.tar.gz" "$(_get_jdk_url_with_default "11.0.8")"
-    assertEquals "${JDK_BASE_URL:?}/zulu-11.0.8.tar.gz" "$(_get_jdk_url_with_default "zulu-11.0.8")"
+    assertEquals "${JDK_URL_1_8}" "$(_get_jdk_url_with_default "1.8.0_412")"
+    assertEquals "${JDK_BASE_URL:?}/openjdk11.0.23.tar.gz" "$(_get_jdk_url_with_default "11.0.23")"
+    assertEquals "${JDK_BASE_URL:?}/zulu-11.0.23.tar.gz" "$(_get_jdk_url_with_default "zulu-11.0.23")"
     unset JDK_URL_1_8
 
-    export JDK_URL_1_7="https://example.com/java7"
-    assertEquals "${JDK_URL_1_7}" "$(_get_jdk_url_with_default "1.7.0_272")"
-    assertEquals "${JDK_BASE_URL:?}/openjdk1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
-    unset JDK_URL_1_7
-
     export JDK_URL_11="https://example.com/java11"
-    assertEquals "${JDK_URL_11}" "$(_get_jdk_url_with_default "11.0.8")"
-    assertEquals "${JDK_BASE_URL:?}/openjdk1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
+    assertEquals "${JDK_URL_11}" "$(_get_jdk_url_with_default "11.0.23")"
+    assertEquals "${JDK_BASE_URL:?}/openjdk1.8.0_412.tar.gz" "$(_get_jdk_url_with_default "1.8.0_412")"
     unset JDK_URL_11
   else
-    assertEquals "${JDK_BASE_URL:?}/zulu-1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
+    assertEquals "${JDK_BASE_URL:?}/zulu-1.8.0_412.tar.gz" "$(_get_jdk_url_with_default "1.8.0_412")"
 
     export JDK_URL_1_8="https://example.com/java8"
-    assertEquals "${JDK_URL_1_8}" "$(_get_jdk_url_with_default "1.8.0_332")"
+    assertEquals "${JDK_URL_1_8}" "$(_get_jdk_url_with_default "1.8.0_412")"
     assertEquals "${JDK_BASE_URL:?}/zulu-1.7.0_272.tar.gz" "$(_get_jdk_url_with_default "1.7.0_272")"
-    assertEquals "${JDK_BASE_URL:?}/zulu-11.0.8.tar.gz" "$(_get_jdk_url_with_default "11.0.8")"
-    assertEquals "${JDK_BASE_URL:?}/openjdk11.0.8.tar.gz" "$(_get_jdk_url_with_default "openjdk-11.0.8")"
+    assertEquals "${JDK_BASE_URL:?}/zulu-11.0.23.tar.gz" "$(_get_jdk_url_with_default "11.0.23")"
+    assertEquals "${JDK_BASE_URL:?}/openjdk11.0.23.tar.gz" "$(_get_jdk_url_with_default "openjdk-11.0.23")"
     unset JDK_URL_1_8
 
-    export JDK_URL_1_7="https://example.com/java7"
-    assertEquals "${JDK_URL_1_7}" "$(_get_jdk_url_with_default "1.7.0_272")"
-    assertEquals "${JDK_BASE_URL:?}/zulu-1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
-    unset JDK_URL_1_7
-
     export JDK_URL_11="https://example.com/java11"
-    assertEquals "${JDK_URL_11}" "$(_get_jdk_url_with_default "11.0.8")"
-    assertEquals "${JDK_BASE_URL:?}/zulu-1.8.0_332.tar.gz" "$(_get_jdk_url_with_default "1.8.0_332")"
+    assertEquals "${JDK_URL_11}" "$(_get_jdk_url_with_default "11.0.23")"
+    assertEquals "${JDK_BASE_URL:?}/zulu-1.8.0_412.tar.gz" "$(_get_jdk_url_with_default "1.8.0_412")"
     unset JDK_URL_11
   fi
 }