Merge pull request #125 from njtierney/add-tile-tests

Add more testing

.Rbuildignore

@@ -21,3 +21,4 @@
 ^doc$
 ^Meta$
 ^codemeta\.json$
+^\.covrignore$

.covrignore

@@ -0,0 +1 @@
+R/release_bullets.R

R/tar-terra-rast.R

@@ -88,9 +88,7 @@ tar_terra_rast <- function(name,
   preserve_metadata <- rlang::arg_match0(preserve_metadata, c("drop", "zip"))
 
   # ensure that user-passed `resources` doesn't include `custom_format`
-  if ("custom_format" %in% names(resources)) {
-    cli::cli_abort("{.val custom_format} cannot be supplied to targets created with {.fn tar_terra_rast}")
-  }
+  check_user_resources(resources)
 
   name <- targets::tar_deparse_language(substitute(name))
 

R/tar-terra-sprc.R

@@ -73,9 +73,7 @@ tar_terra_sprc <- function(name,
                            cue = targets::tar_option_get("cue"),
                            description = targets::tar_option_get("description")) {
   # ensure that user-passed `resources` doesn't include `custom_format`
-  if ("custom_format" %in% names(resources)) {
-    cli::cli_abort("{.val custom_format} cannot be supplied to targets created with {.fn tar_terra_sprc}")
-  }
+    check_user_resources(resources)
 
   gdal <- gdal %||% character(0)
   filetype <- filetype %||% "GTiff"
@@ -196,9 +194,7 @@ tar_terra_sds <- function(name,
                           cue = targets::tar_option_get("cue"),
                           description = targets::tar_option_get("description")) {
   # ensure that user-passed `resources` doesn't include `custom_format`
-  if ("custom_format" %in% names(resources)) {
-    cli::cli_abort("{.val custom_format} cannot be supplied to targets created with {.fn tar_terra_sprc}")
-  }
+    check_user_resources(resources)
 
   gdal <- gdal %||% character(0)
   filetype <- filetype %||% "GTiff"

R/tar-terra-vect.R

@@ -89,9 +89,7 @@ tar_terra_vect <- function(name,
   }
 
   # ensure that user-passed `resources` doesn't include `custom_format`
-  if ("custom_format" %in% names(resources)) {
-    cli::cli_abort("{.val custom_format} cannot be supplied to targets created with {.fn tar_terra_vect}")
-  }
+  check_user_resources(resources)
 
   name <- targets::tar_deparse_language(substitute(name))
 

R/tar_terra_tiles.R

@@ -350,7 +350,12 @@ tile_blocksize <- function(raster, n_blocks_row = 1, n_blocks_col = 1) {
 #' @rdname tile_helpers
 tile_n <- function(raster, n) {
     if (!rlang::is_integerish(n)) {
-        rlang::abort("`n` must be an integer.")
+        cli::cli_abort(
+            c(
+                "{.val {n}} must be an integer.",
+                "We see that {.val n} is: {n}"
+                )
+        )
     }
     sq <- sqrt(n)
     sq_round <- floor(sq)

R/utils.R

@@ -44,10 +44,17 @@ get_gdal_available_driver_list <- function(driver_type) {
   drv
 }
 
-semicolon_split <- function(env_vars) {
-  strsplit(env_vars, ";")[[1]]
-}
-
-semicolon_paste <- function(vec) {
-  paste0(vec, collapse = ";")
+check_user_resources <- function(resources,
+                                 call = rlang::caller_env()){
+    if ("custom_format" %in% names(resources)) {
+        cli::cli_abort(
+            message = c(
+                "{.val custom_format} cannot be supplied to targets created \\
+                with {.fn tar_terra_rast}",
+                "We see in {.code names(resources)}:",
+                "{.val {names(resources)}}"
+                ),
+            call = call
+        )
+    }
 }

tests/testthat/_snaps/check-user-resources.md

@@ -0,0 +1,10 @@
+# check_user_resources works
+
+    Code
+      check_user_resources(resources = c(custom_format = 1))
+    Condition
+      Error:
+      ! "custom_format" cannot be supplied to targets created with `tar_terra_rast()`
+      We see in `names(resources)`:
+      "custom_format"
+

tests/testthat/_snaps/tile-funs.md

@@ -0,0 +1,33 @@
+# tile_n fails with non integer
+
+    Code
+      tile_n(r, n = 3.14)
+    Condition
+      Error in `tile_n()`:
+      ! 3.14 must be an integer.
+      We see that "n" is: 3.14
+
+---
+
+    Code
+      tile_n(r, n = 4)
+    Message
+      creating 2 * 2 = 4 tile extents
+    Output
+      [[1]]
+           xmin      xmax      ymin      ymax 
+       5.741667  6.141667 49.816667 50.191667 
+      
+      [[2]]
+           xmin      xmax      ymin      ymax 
+       6.133333  6.533333 49.816667 50.191667 
+      
+      [[3]]
+           xmin      xmax      ymin      ymax 
+       5.741667  6.141667 49.441667 49.816667 
+      
+      [[4]]
+           xmin      xmax      ymin      ymax 
+       6.133333  6.533333 49.441667 49.816667 
+      
+

tests/testthat/test-check-user-resources.R

@@ -0,0 +1,9 @@
+test_that("check_user_resources works", {
+    expect_snapshot(
+        error = TRUE,
+        check_user_resources(resources = c("custom_format" = 1))
+    )
+    expect_silent(
+        check_user_resources(resources = c("anything else" = 1))
+    )
+})

tests/testthat/test-tile-funs.R

@@ -0,0 +1,12 @@
+test_that("tile_n fails with non integer", {
+    f <- system.file("ex/elev.tif", package = "terra")
+    r <- terra::rast(f)
+    expect_snapshot(
+        error = TRUE,
+        tile_n(r, n = 3.14)
+    )
+    skip_on_ci()
+    expect_snapshot(
+        tile_n(r, n = 4)
+    )
+})