Merge pull request #66 from ropensci/cran_error

Skip if offline, on cran
ropensci · Sep 28, 2023 · a2823a9 · a2823a9
2 parents 492011c + 09ae334
commit a2823a9
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # terrainr (development version)
 
+* More tests are flagged to skip on CRAN, or when run offline
+
+* `georeference_overlay` should give fewer useless warnings
+
 # terrainr 0.7.4
 
 * New query method is dramatically faster and less-error prone.

diff --git a/R/georeference_overlay.R b/R/georeference_overlay.R
@@ -63,7 +63,7 @@ georeference_overlay <- function(overlay_file,
 
   image_read <- switch(file_type,
     "png" = png::readPNG,
-    "tiff" = tiff::readTIFF,
+    "tiff" = \(x) suppressWarnings(tiff::readTIFF(x)),
     "jpeg" = jpeg::readJPEG
   )
 

diff --git a/tests/testthat/test-2-get_tiles_3dep.R b/tests/testthat/test-2-get_tiles_3dep.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same elevation tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)
@@ -56,6 +57,7 @@ test_that("get_tiles fails as expected", {
 
 test_that("specifying SR works", {
   skip_on_cran()
+  skip_if_offline()
   dat <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_USGSHydroCached.R b/tests/testthat/test-2-get_tiles_USGSHydroCached.R
@@ -1,6 +1,7 @@
 # Disabled due to unreliable API endpoint
 test_that("get_tiles gets the same topo tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_USGSImageryOnly.R b/tests/testthat/test-2-get_tiles_USGSImageryOnly.R
@@ -1,6 +1,7 @@
 # Disabled due to unreliable API endpoint
 test_that("get_tiles gets the same topo tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_USGSShadedReliefOnly.R b/tests/testthat/test-2-get_tiles_USGSShadedReliefOnly.R
@@ -1,6 +1,7 @@
 # Disabled due to unreliable API endpoint
 test_that("get_tiles gets the same topo tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_USGSTNMBlank.R b/tests/testthat/test-2-get_tiles_USGSTNMBlank.R
@@ -1,6 +1,7 @@
 # Disabled due to unreliable API endpoint
 test_that("get_tiles gets the same topo tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_USGSTopo.R b/tests/testthat/test-2-get_tiles_USGSTopo.R
@@ -1,6 +1,7 @@
 # Disabled due to unreliable API endpoint
 test_that("get_tiles gets the same topo tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_ecosystems.R b/tests/testthat/test-2-get_tiles_ecosystems.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same ecosystems tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_geonames.R b/tests/testthat/test-2-get_tiles_geonames.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same geonames tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_govunits.R b/tests/testthat/test-2-get_tiles_govunits.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same govunits tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_nhd.R b/tests/testthat/test-2-get_tiles_nhd.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same hydro tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_transportation.R b/tests/testthat/test-2-get_tiles_transportation.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same transportation tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-2-get_tiles_wbd.R b/tests/testthat/test-2-get_tiles_wbd.R
@@ -1,5 +1,6 @@
 test_that("get_tiles gets the same wbd tiles twice", {
   skip_on_cran()
+  skip_if_offline()
   dl_loc <- data.frame(
     lat = c(44.04905, 44.04911),
     lng = c(-74.01188, -74.01179)

diff --git a/tests/testthat/test-3-hit_api.R b/tests/testthat/test-3-hit_api.R
@@ -1,5 +1,6 @@
 test_that("dots replace their arguments", {
   skip_on_cran()
+  skip_if_offline()
   expect_equal(
     hit_national_map_api(
       list(

diff --git a/tests/testthat/test-4-merge_rasters.R b/tests/testthat/test-4-merge_rasters.R
@@ -1,5 +1,6 @@
 test_that("merge_raster files are identical no matter the filename", {
   skip_on_cran()
+  skip_if_offline()
   df <- data.frame(
     lat = c(44.050030001, 44.05003),
     lng = c(-74.01164, -74.011640001)
@@ -43,6 +44,7 @@ test_that("merge_raster files are identical no matter the filename", {
 
 test_that("fallback method works", {
   skip_on_cran()
+  skip_if_offline()
   # Just for time savings
   skip_on_os(c("windows", "mac"))
   df <- data.frame(
@@ -89,6 +91,7 @@ test_that("fallback method works", {
 
 test_that("overwrite works as expected", {
   skip_on_cran()
+  skip_if_offline()
   test_file <- tempfile(fileext = ".tif")
   test_copy <- tempfile(fileext = ".tif")
 

diff --git a/tests/testthat/test-geom_spatial_rgb.R b/tests/testthat/test-geom_spatial_rgb.R
@@ -1,5 +1,6 @@
 test_that("all methods of geom_spatial_rgb are equivalent", {
   skip_on_cran()
+  skip_if_offline()
   simulated_data <- data.frame(
     id = seq(1, 100, 1),
     lat = runif(100, 44.04905, 44.17609),

diff --git a/tests/testthat/test-get_tiles.R b/tests/testthat/test-get_tiles.R
@@ -1,6 +1,8 @@
 # Note: Individual data sources also have tests as test-2-get_tiles_<data>.R
 
 test_that("SpatRast method is consistent", {
+  skip_on_cran()
+  skip_if_offline()
   tmp_raster <- terra::rast("testdata/merge_rasters_test.tif")
   rstr_tile <- get_tiles(tmp_raster, bboxSR = 4326, imageSR = 4326)
   downloaded_raster <- terra::rast(rstr_tile[["elevation"]])
@@ -26,6 +28,7 @@ test_that("warnings fire appropriately", {
 
 test_that("The deprecated list method still works", {
   skip_on_cran()
+  skip_if_offline()
   output_tif <- suppressWarnings(
     get_tiles(list(
       c(lat = 44.04905, lng = -74.01188),
@@ -58,6 +61,7 @@ test_that("The deprecated list method still works", {
 
 test_that("projected returns are consistent", {
   skip_on_cran()
+  skip_if_offline()
   # For some reason, the exact boundaries appear to be system-specific
   # They're very close across systems, but the API returns a slightly wider
   # area for Mac and Windows than Linux