From 8535acd763346cd8b42a41e25883f6ab36bb7626 Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 26 Sep 2023 09:03:35 -0400 Subject: [PATCH 1/2] Skip if offline, on cran --- tests/testthat/test-2-get_tiles_3dep.R | 2 ++ tests/testthat/test-2-get_tiles_USGSHydroCached.R | 1 + tests/testthat/test-2-get_tiles_USGSImageryOnly.R | 1 + tests/testthat/test-2-get_tiles_USGSShadedReliefOnly.R | 1 + tests/testthat/test-2-get_tiles_USGSTNMBlank.R | 1 + tests/testthat/test-2-get_tiles_USGSTopo.R | 1 + tests/testthat/test-2-get_tiles_ecosystems.R | 1 + tests/testthat/test-2-get_tiles_geonames.R | 1 + tests/testthat/test-2-get_tiles_govunits.R | 1 + tests/testthat/test-2-get_tiles_nhd.R | 1 + tests/testthat/test-2-get_tiles_transportation.R | 1 + tests/testthat/test-2-get_tiles_wbd.R | 1 + tests/testthat/test-3-hit_api.R | 1 + tests/testthat/test-4-merge_rasters.R | 1 + tests/testthat/test-geom_spatial_rgb.R | 1 + tests/testthat/test-get_tiles.R | 4 ++++ 16 files changed, 20 insertions(+) diff --git a/tests/testthat/test-2-get_tiles_3dep.R b/tests/testthat/test-2-get_tiles_3dep.R index 7428f1a..5c05da0 100644 --- 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 index df81389..5d74766 100644 --- 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 index eea3b16..38ce7c2 100644 --- 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 index b21b552..64f2d69 100644 --- 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 index 58b520d..4da9dfd 100644 --- 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 index c66713c..199f1a6 100644 --- 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 index 9bdc2c2..6c7a962 100644 --- 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 index a5e612e..e13ee08 100644 --- 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 index ffba157..d25efc2 100644 --- 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 index c05cf88..8bb54d5 100644 --- 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 index 9684467..c429d78 100644 --- 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 index 3e9d33a..69b306c 100644 --- 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 index 3219754..e7fdaa6 100644 --- 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 index 3934072..428fd05 100644 --- 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) diff --git a/tests/testthat/test-geom_spatial_rgb.R b/tests/testthat/test-geom_spatial_rgb.R index 75de34a..6dee0b2 100644 --- 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 index e94eefb..d8b5e40 100644 --- 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_.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 From 09ae3347fb84c108f79737e312910876ed009b12 Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 26 Sep 2023 09:25:50 -0400 Subject: [PATCH 2/2] Silence warnings, tests --- NEWS.md | 4 ++++ R/georeference_overlay.R | 2 +- tests/testthat/test-4-merge_rasters.R | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 0f7a40e..0fd7ea0 100644 --- 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 index e749e89..185f8e1 100644 --- 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-4-merge_rasters.R b/tests/testthat/test-4-merge_rasters.R index 428fd05..6111ff1 100644 --- a/tests/testthat/test-4-merge_rasters.R +++ b/tests/testthat/test-4-merge_rasters.R @@ -44,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( @@ -90,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")