@@ -237,9 +237,16 @@ test_that("java_find_system uses correct executable name for OS", {
237237
238238 withr :: local_envvar(JAVA_HOME = temp_java )
239239
240- # Mock java_check_version_cmd
240+ # Mock the internal implementation
241241 local_mocked_bindings(
242- java_check_version_cmd = function (java_home , quiet = TRUE ) " 17" ,
242+ ._java_version_check_impl_original = function (java_home ) {
243+ list (
244+ major_version = " 17" ,
245+ java_home = java_home ,
246+ java_path = " mock" ,
247+ java_version_output = " mock"
248+ )
249+ },
243250 .package = " rJavaEnv"
244251 )
245252
@@ -283,7 +290,14 @@ test_that("java_find_system handles special characters in paths", {
283290
284291 # Mock java_check_version_cmd
285292 local_mocked_bindings(
286- java_check_version_cmd = function (java_home , quiet = TRUE ) " 17" ,
293+ ._java_version_check_impl_original = function (java_home ) {
294+ list (
295+ major_version = " 17" ,
296+ java_home = java_home ,
297+ java_path = " mock" ,
298+ java_version_output = " mock"
299+ )
300+ },
287301 .package = " rJavaEnv"
288302 )
289303
@@ -333,7 +347,14 @@ test_that("java_find_system passes quiet=TRUE to platform_detect", {
333347 quiet_passed <<- quiet
334348 list (os = " linux" , arch = " x64" )
335349 },
336- java_check_version_cmd = function (java_home , quiet = TRUE ) " 17" ,
350+ ._java_version_check_impl_original = function (java_home ) {
351+ list (
352+ major_version = " 17" ,
353+ java_home = java_home ,
354+ java_path = " mock" ,
355+ java_version_output = " mock"
356+ )
357+ },
337358 .package = " rJavaEnv"
338359 )
339360
@@ -354,7 +375,14 @@ test_that("java_find_system passes quiet=FALSE to platform_detect", {
354375 quiet_passed <<- quiet
355376 list (os = " linux" , arch = " x64" )
356377 },
357- java_check_version_cmd = function (java_home , quiet = TRUE ) " 17" ,
378+ ._java_version_check_impl_original = function (java_home ) {
379+ list (
380+ major_version = " 17" ,
381+ java_home = java_home ,
382+ java_path = " mock" ,
383+ java_version_output = " mock"
384+ )
385+ },
358386 .package = " rJavaEnv"
359387 )
360388
@@ -401,7 +429,14 @@ test_that("java_find_system handles symlinks to Java installation", {
401429
402430 # Mock java_check_version_cmd to return a version for the mock installation
403431 local_mocked_bindings(
404- java_check_version_cmd = function (java_home , quiet = TRUE ) " 17" ,
432+ ._java_version_check_impl_original = function (java_home ) {
433+ list (
434+ major_version = " 17" ,
435+ java_home = java_home ,
436+ java_path = " mock" ,
437+ java_version_output = " mock"
438+ )
439+ },
405440 .package = " rJavaEnv"
406441 )
407442
@@ -563,7 +598,14 @@ test_that("java_find_system handles symlinks to cache correctly", {
563598
564599 # Mock java_check_version_cmd
565600 local_mocked_bindings(
566- java_check_version_cmd = function (java_home , quiet = TRUE ) " 11" ,
601+ ._java_version_check_impl_original = function (java_home ) {
602+ list (
603+ major_version = " 11" ,
604+ java_home = java_home ,
605+ java_path = " mock" ,
606+ java_version_output = " mock"
607+ )
608+ },
567609 .package = " rJavaEnv"
568610 )
569611
0 commit comments