tests: remove skipped tests, adapt commented code for other_keys

Author: dshemetov

tests/testthat/test-epi_df.R

@@ -23,24 +23,6 @@ test_that("new_epi_df works as intended", {
   expect_true(lubridate::is.POSIXt(attributes(epi_tib)$metadata$as_of))
 })
 
-test_that("as_epi_df errors when additional_metadata is not a list", {
-  skip("additional_metadata is no longer an argument, not tested")
-  # This is the 3rd example from as_epi_df
-  ex_input <- jhu_csse_county_level_subset %>%
-    dplyr::filter(time_value > "2021-12-01", state_name == "Massachusetts") %>%
-    dplyr::slice_tail(n = 6) %>%
-    tsibble::as_tsibble() %>%
-    dplyr::mutate(
-      state = rep("MA", 6),
-      pol = rep(c("blue", "swing", "swing"), each = 2)
-    )
-
-  expect_error(
-    as_epi_df(ex_input, additional_metadata = c(other_keys = "state", "pol")),
-    "Must be of type 'list', not 'character'."
-  )
-})
-
 test_that("as_epi_df errors for non-character other_keys", {
   ex_input <- jhu_csse_county_level_subset %>%
     dplyr::filter(time_value > "2021-12-01", state_name == "Massachusetts") %>%

tests/testthat/test-epix_merge.R

@@ -177,28 +177,6 @@ test_that("epix_merge forbids and warns on metadata and naming issues", {
     ),
     regexp = "overlapping.*names"
   )
-
-  skip("Additional metadata is no longer used, not tested.")
-  expect_warning(
-    epix_merge(
-      as_epi_archive(tibble::tibble(geo_value = "ak", time_value = test_date, version = test_date + 1L, x_value = 1L),
-        additional_metadata = list("updates_fetched" = lubridate::ymd_hms("2022-05-01 16:00:00", tz = "UTC"))
-      ),
-      as_epi_archive(tibble::tibble(geo_value = "ak", time_value = test_date, version = test_date + 1L, y_value = 2L))
-    ),
-    regexp = "x\\$additional_metadata",
-    class = "epiprocess__epix_merge_ignores_additional_metadata"
-  )
-  expect_warning(
-    epix_merge(
-      as_epi_archive(tibble::tibble(geo_value = "ak", time_value = test_date, version = test_date + 1L, x_value = 1L)),
-      as_epi_archive(tibble::tibble(geo_value = "ak", time_value = test_date, version = test_date + 1L, y_value = 2L),
-        additional_metadata = list("updates_fetched" = lubridate::ymd_hms("2022-05-01 16:00:00", tz = "UTC"))
-      )
-    ),
-    regexp = "y\\$additional_metadata",
-    class = "epiprocess__epix_merge_ignores_additional_metadata"
-  )
 })
 
 # use `local` to prevent accidentally using the x, y, xy bindings here

tests/testthat/test-grouped_epi_archive.R

@@ -72,7 +72,7 @@ test_that("Grouping, regrouping, and ungrouping archives works as intended", {
       # #
       # as_epi_df(geo_type = "nation", # bug; want "custom" from NA; issue #242
       #           as_of = as.Date("2000-01-03"),
-      #           additional_metadata = list(other_keys = "age_group")) %>%
+      #           other_keys = "age_group") %>%
       # # put back in expected order; see issue #166:
       # select(age_group, geo_value, time_value, s) %>%
       # nolint end
@@ -94,7 +94,7 @@ test_that("Grouping, regrouping, and ungrouping archives works as intended", {
         time_value = as.Date(time_value)
       ) %>%
       # as_epi_df(as_of = as.Date("2000-01-03"),
-      #           additional_metadata = list(other_keys = "age_group")) %>%
+      #           other_keys = "age_group") %>%
       # # put back in expected order; see issue #166:
       # select(geo_value, age_group, time_value, s) %>%
       group_by(geo_value, age_group, .drop = FALSE)