Fix tests for NA/NaN

.github/workflows/pkgdown.yaml

@@ -30,7 +30,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::pkgdown, any::decor, any::bench, local::.
+          extra-packages: any::pkgdown, any::cpp11, any::decor, any::bench, local::.
           needs: website
 
       - name: Build site

NEWS.md

@@ -1,5 +1,7 @@
 # wk (development version)
 
+* Fix tests for updated waldo package (#178).
+
 # wk 0.7.2
 
 * Fix use-after-free warnings.

R/utils.R

@@ -34,3 +34,9 @@ recycle_common <- function(...) {
 is_vector_class <- function(x) {
   identical(class(x[integer(0)]), class(x))
 }
+
+# This helps when comparing with sf package objects, which tend to use
+# NA rather than NaN.
+expect_equal_ignore_na_nan <- function(actual, expected) {
+  testthat::expect_true(all.equal(actual, expected))
+}

tests/testthat/test-grd-subset.R

@@ -371,7 +371,7 @@ test_that("grd_cell_xy() works for grd_rct()", {
   empty <- grd_rct(matrix(nrow = 0, ncol = 0))
   expect_identical(
     grd_cell_xy(empty, 0, 0),
-    xy(NA, NA)
+    xy(NaN, NaN)
   )
 
   grid <- grd(nx = 3, ny = 2)
@@ -397,7 +397,7 @@ test_that("grd_cell_xy() works for grd_xy()", {
   empty <- grd_xy(matrix(nrow = 0, ncol = 0))
   expect_identical(
     grd_cell_xy(empty, 0, 0),
-    xy(NA, NA)
+    xy(NaN, NaN)
   )
 
   grid <- grd(nx = 3, ny = 2, type = "centers")

tests/testthat/test-pkg-sf.R

@@ -119,19 +119,26 @@ test_that("conversion from bbox to rct works", {
 test_that("conversion to sf works", {
   skip_if_not_installed("sf")
 
+  # Use NaN/NaN instead of NA/NA because Waldo cares about this comparison
   sfc <- sf::st_sfc(sf::st_point(), sf::st_point(c(0, 1)), NULL, crs = 4326)
   sf <- sf::st_as_sf(new_data_frame(list(geometry = sfc)))
   wkb <- as_wkb(c("POINT EMPTY", "POINT (0 1)", NA), crs = 4326)
   wkt <- as_wkt(c("POINT EMPTY", "POINT (0 1)", NA), crs = 4326)
 
-  expect_equal(sf::st_as_sf(wkb), sf)
-  expect_equal(sf::st_as_sfc(wkb), sfc)
+  expect_equal_ignore_na_nan(sf::st_as_sf(wkb), sf)
+  expect_equal_ignore_na_nan(sf::st_as_sfc(wkb), sfc)
   expect_equal(sf::st_as_sf(wkt), sf)
   expect_equal(sf::st_as_sfc(wkt), sfc)
 
   # xy
-  expect_equal(sf::st_as_sf(xy(c(NA, 0, NA), c(NA, 1, NA), crs = 4326)), sf)
-  expect_equal(sf::st_as_sfc(xy(c(NA, 0, NA), c(NA, 1, NA), crs = 4326)), sfc)
+  expect_equal_ignore_na_nan(
+    sf::st_as_sf(xy(c(NA, 0, NA), c(NA, 1, NA), crs = 4326)),
+    sf
+  )
+  expect_equal_ignore_na_nan(
+    sf::st_as_sfc(xy(c(NA, 0, NA), c(NA, 1, NA), crs = 4326)),
+    sfc
+  )
 
   # xy with all !is.na() uses faster sf conversion with coords
   expect_equal(sf::st_as_sf(xy(0, 1, crs = 4326)), sf[2,, , drop = FALSE])

tests/testthat/test-sfc-writer.R

@@ -6,7 +6,7 @@ test_that("sfc_writer() works with fixed-length input", {
   expect_identical(wk_handle(wkb(), sfc_writer()), sf::st_sfc())
 
   # empties (equal because of NaN/NA difference for POINT)
-  expect_equal(
+  expect_equal_ignore_na_nan(
     wk_handle(
       as_wkb(
         c("POINT EMPTY", "LINESTRING EMPTY", "POLYGON EMPTY",
@@ -25,7 +25,7 @@ test_that("sfc_writer() works with fixed-length input", {
 
   # subtely different for WKT, since a point will fire zero coordinates
   # whereas for WKB it will fire (NaN, NaN)
-  expect_equal(
+  expect_equal_ignore_na_nan(
     wk_handle(
       as_wkt(
         c("POINT EMPTY", "LINESTRING EMPTY", "POLYGON EMPTY",
@@ -125,7 +125,7 @@ test_that("sfc_writer() turns NULLs into EMPTY", {
   )
 
   for (i in seq_along(all_types)) {
-    expect_equal(
+    expect_equal_ignore_na_nan(
       wk_handle(c(all_types[i], wkb(list(NULL))), sfc_writer()),
       wk_handle(c(all_types[i], all_types[i]), sfc_writer())
     )
@@ -155,7 +155,7 @@ test_that("sfc_writer() turns NULLs into EMPTY", {
 
   for (i in seq_along(all_types)) {
     vec <- wk_handle(c(all_types_non_empty[i], wkb(list(NULL))), sfc_writer())
-    expect_equal(vec[[2]], wk_handle(all_types[i], sfc_writer())[[1]])
+    expect_equal_ignore_na_nan(vec[[2]], wk_handle(all_types[i], sfc_writer())[[1]])
     expect_s3_class(vec, paste0("sfc_", types[i]))
   }
 
@@ -169,7 +169,7 @@ test_that("sfc_writer() turns NULLs into EMPTY", {
   )
 
   for (i in seq_along(all_types)) {
-    expect_equal(
+    expect_equal_ignore_na_nan(
       wk_handle(c(zm_types[i], wkb(list(NULL))), sfc_writer()),
       wk_handle(c(zm_types[i], zm_types_empty[i]), sfc_writer())
     )