wrapper function error messages

NIEHS · Aug 27, 2024 · 83b4787 · 83b4787
1 parent 96188b0
commit 83b4787
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/R/calculate_covariates.R b/R/calculate_covariates.R
@@ -108,12 +108,14 @@ calc_covariates <-
           ...
         )
       }, error = function(e) {
-        message(e)
-        message(args(what_to_run))
         stop(
           paste0(
-            "Please refer to the argument list and the error message above ",
-            "to rectify the error.\n"
+            e,
+            "\n",
+            paste0(deparse(args(what_to_run)), collapse = "\n"),
+            "\n",
+            "Please refer to the argument list and ",
+            "the error message above to rectify the error.\n"
           )
         )
       })

diff --git a/R/download.R b/R/download.R
@@ -109,10 +109,16 @@ download_data <-
         )
       },
       error = function(e) {
-        message(e)
-        message(args(what_to_run))
-        stop(paste0("Please refer to the argument list and ",
-                    "the error message above to rectify the error.\n"))
+        stop(
+          paste0(
+            e,
+            "\n",
+            paste0(deparse(args(what_to_run)), collapse = "\n"),
+            "\n",
+            "Please refer to the argument list and ",
+            "the error message above to rectify the error.\n"
+          )
+        )
       }
     )
   }

diff --git a/R/process.R b/R/process.R
@@ -109,12 +109,14 @@ process_covariates <-
           ...
         )
       }, error = function(e) {
-        message(e)
-        message(args(what_to_run))
         stop(
           paste0(
-            "Please refer to the argument list and the error message above to ",
-            "rectify the error.\n"
+            e,
+            "\n",
+            paste0(deparse(args(what_to_run)), collapse = "\n"),
+            "\n",
+            "Please refer to the argument list and ",
+            "the error message above to rectify the error.\n"
           )
         )
       })

diff --git a/tests/testthat/test-download.R b/tests/testthat/test-download.R
@@ -37,30 +37,30 @@ testthat::test_that("download_data (expected errors - directory)", {
 
 testthat::test_that("download_data (expected errors - temporal range)", {
   withr::with_tempdir({
-    expect_error(
+    testthat::expect_error(
       download_geos(
       date = c("1900-01-01", "2018-01-01"),
       collection = "aqc_tavg_1hr_g1440x721_v1",
       acknowledgement = TRUE,
       directory_to_save = "."
       )
     )
-    expect_error(
+    testthat::expect_error(
       download_aqs(
       year = c(1900, 2022),
       acknowledgement = TRUE,
       directory_to_save = "."
       )
     )
-    expect_error(
+    testthat::expect_error(
       download_narr(
         year = c(1900, 2022),
         variables = "air.sfc",
         acknowledgement = TRUE,
         directory_to_save = "."
       )
     )
-    expect_error(
+    testthat::expect_error(
       download_merra2(
         date = c("1900-01-01", "2023-09-01"),
         collection = "inst1_2d_asm_Nx",
@@ -70,22 +70,22 @@ testthat::test_that("download_data (expected errors - temporal range)", {
       )
     )
     sink()
-    expect_error(
+    testthat::expect_error(
       download_hms(
         date = c("1900-01-01", "2018-01-01"),
         directory_to_save = ".",
         acknowledgement = TRUE
       )
     )
-    expect_error(
+    testthat::expect_error(
       download_gridmet(
         year = c(1900, 2022),
         variables = "Precipitation",
         acknowledgement = TRUE,
         directory_to_save = "."
       )
     )
-    expect_error(
+    testthat::expect_error(
       download_terraclimate(
         year = c(1900, 2022),
         variables = "Wind Speed",