update fallback version options

Author: e-kotov

R/internal_utilities.R

@@ -20,6 +20,8 @@ platform_detect <- function(quiet = TRUE) {
     "x86-64" = "x64",
     "x86_64" = "x64",
     "i386" = "x86",
+    "i486" = "x86",
+    "i586" = "x86",
     "i686" = "x86",
     "aarch64" = "aarch64",
     "arm64" = "aarch64",

R/java_valid_versions.R

@@ -116,10 +116,7 @@ java_valid_major_versions_corretto <- function(
     },
     error = function(e) {
       platform_arch <- paste(platform, arch, sep = "_")
-      getOption(paste0(
-        "rJavaEnv.fallback_valid_versions_current_platform_",
-        platform_arch
-      ))
+      getOption(paste0("rJavaEnv.fallback_valid_versions_", platform_arch))
     }
   )
 

R/onLoad.R

@@ -1,11 +1,13 @@
 .onLoad <- function(libname, pkgname) {
-  # Detect the current platform (OS and architecture)
-  platform <- platform_detect(quiet = TRUE)
-
-  # Select the fallback valid Java versions based on the detected platform
-  fallback_current <- switch(
-    paste(platform$os, platform$arch, sep = "_"),
-    "macos_aarch64" = c(
+  # First, set all the base rJavaEnv options
+  op <- options()
+  op.rJavaEnv <- list(
+    # Default folder choice (in line with renv package)
+    rJavaEnv.cache_path = tools::R_user_dir("rJavaEnv", which = "cache"),
+    rJavaEnv.valid_versions_cache = NULL,
+    rJavaEnv.valid_versions_timestamp = NULL,
+    # Fallback lists for various platforms
+    rJavaEnv.fallback_valid_versions_macos_aarch64 = c(
       "8",
       "11",
       "17",
@@ -17,7 +19,7 @@
       "23",
       "24"
     ),
-    "macos_x64" = c(
+    rJavaEnv.fallback_valid_versions_macos_x64 = c(
       "8",
       "11",
       "15",
@@ -31,7 +33,7 @@
       "23",
       "24"
     ),
-    "linux_aarch64" = c(
+    rJavaEnv.fallback_valid_versions_linux_aarch64 = c(
       "8",
       "11",
       "15",
@@ -45,7 +47,7 @@
       "23",
       "24"
     ),
-    "linux_x64" = c(
+    rJavaEnv.fallback_valid_versions_linux_x64 = c(
       "8",
       "11",
       "15",
@@ -59,32 +61,7 @@
       "23",
       "24"
     ),
-    stop("Unsupported platform/architecture combination")
-  )
-
-  # Get current options
-  op <- options()
-
-  # Create list of rJavaEnv options including the current platform valid versions
-  op.rJavaEnv <- list(
-    # Default folder choice (in line with renv package)
-    rJavaEnv.cache_path = tools::R_user_dir("rJavaEnv", which = "cache"),
-    rJavaEnv.valid_versions_cache = NULL,
-    rJavaEnv.valid_versions_timestamp = NULL,
-    # Fallback lists for various platforms
-    rJavaEnv.fallback_valid_versions_current_platform_macos_aarch64 = c(
-      "8",
-      "11",
-      "17",
-      "18",
-      "19",
-      "20",
-      "21",
-      "22",
-      "23",
-      "24"
-    ),
-    rJavaEnv.fallback_valid_versions_current_platform_macos_x64 = c(
+    rJavaEnv.fallback_valid_versions_windows_x64 = c(
       "8",
       "11",
       "15",
@@ -98,41 +75,33 @@
       "23",
       "24"
     ),
-    rJavaEnv.fallback_valid_versions_current_platform_linux_aarch64 = c(
+    rJavaEnv.fallback_valid_versions_windows_x86 = c(
       "8",
-      "11",
-      "15",
-      "16",
-      "17",
-      "18",
-      "19",
-      "20",
-      "21",
-      "22",
-      "23",
-      "24"
-    ),
-    rJavaEnv.fallback_valid_versions_current_platform_linux_x64 = c(
-      "8",
-      "11",
-      "15",
-      "16",
-      "17",
-      "18",
-      "19",
-      "20",
-      "21",
-      "22",
-      "23",
-      "24"
-    ),
-    # Current platform valid versions
-    rJavaEnv.fallback_valid_versions_current_platform_current_platform = fallback_current
+      "11"
+    )
   )
 
-  # Only set the options that haven't been set yet
+  # Only set the options that haven't been defined yet
   toset <- !(names(op.rJavaEnv) %in% names(op))
   if (any(toset)) options(op.rJavaEnv[toset])
 
+  # Now, detect the current platform (OS and architecture)
+  platform <- platform_detect(quiet = TRUE)
+
+  # Build the option name dynamically based on platform$os and platform$arch.
+  # For example, for macOS on x64, this results in "rJavaEnv.fallback_valid_versions_macos_x64"
+  fallback_option_name <- paste0(
+    "rJavaEnv.fallback_valid_versions_",
+    platform$os,
+    "_",
+    platform$arch
+  )
+
+  # Retrieve the corresponding fallback list using getOption()
+  fallback_current <- getOption(fallback_option_name)
+
+  # Set the current platform valid versions option
+  options(rJavaEnv.fallback_valid_versions_current_platform = fallback_current)
+
   invisible()
 }

tests/testthat/test-java_valid_versions.R

@@ -38,28 +38,14 @@ test_that("fallback is used when the API call fails", {
     rJavaEnv.valid_versions_timestamp = NULL
   )
 
-  fallback <- java_valid_versions(force = TRUE)
-
-  # Backup the original fromJSON function from the jsonlite namespace.
-  orig_fromJSON <- get("fromJSON", envir = asNamespace("jsonlite"))
-
-  # Temporarily override fromJSON to simulate an API failure.
-  unlockBinding("read_json", asNamespace("jsonlite"))
-  assign(
-    "read_json",
-    function(...) stop("Simulated API failure"),
-    envir = asNamespace("jsonlite")
-  )
-  on.exit(
-    {
-      assign("read_json", orig_fromJSON, envir = asNamespace("jsonlite"))
-      lockBinding("read_json", asNamespace("jsonlite"))
-    },
-    add = TRUE
+  local_mocked_bindings(
+    read_json = function(...) stop("Simulated API failure"),
+    .package = "jsonlite"
   )
 
+  fallback <- getOption("rJavaEnv.fallback_valid_versions_current_platform")
   versions <- java_valid_versions(force = TRUE)
 
-  # When the API call fails, the fallback list should be returned.
+  ## When the API call fails, the fallback list should be returned.
   expect_equal(versions, fallback)
 })