test helper function behavior

Author: nmdefries

NAMESPACE

@@ -50,7 +50,6 @@ import(cachem)
 import(glue)
 importFrom(MMWRweek,MMWRweek)
 importFrom(MMWRweek,MMWRweek2Date)
-importFrom(MMWRweek,MMWRyear)
 importFrom(checkmate,assert)
 importFrom(checkmate,assert_character)
 importFrom(checkmate,assert_integerish)

R/model.R

@@ -69,12 +69,14 @@ reformat_epirange <- function(epirange, to_type = c("day", "week")) {
 
   # Day format -> week
   if (nchar(epirange$from) == 8 && to_type == "week") {
-    epirange$from <- date_to_epiweek(epirange$from)
-    epirange$to <- date_to_epiweek(epirange$to)
+    return(
+      epirange(date_to_epiweek(epirange$from), date_to_epiweek(epirange$to))
+    )
     # Week format -> day
   } else if (nchar(epirange$from) == 6 && to_type == "day") {
-    epirange$from <- parse_api_week(epirange$from)
-    epirange$to <- parse_api_week(epirange$to)
+    return(
+      epirange(parse_api_week(epirange$from), parse_api_week(epirange$to))
+    )
   }
 
   return(epirange)
@@ -192,8 +194,8 @@ parse_data_frame <- function(epidata_call, df, disable_date_parsing = FALSE) {
 
 #' Converts a date (integer or character) to an epiweek
 #' @param value date (integer or character, with format YYYYMMDD) to be converted to an epiweek
-#' @return an integer representing an epiweek, in the format YYYYWW
-#' @importFrom MMWRweek MMWRyear MMWRweek
+#' @return a character representing an epiweek, in the format YYYYWW
+#' @importFrom MMWRweek MMWRweek
 #' @keywords internal
 date_to_epiweek <- function(value) {
   date_components <- MMWRweek::MMWRweek(as.Date(as.character(value), "%Y%m%d"))

man/date_to_epiweek.Rd

@@ -113,3 +113,47 @@ test_that("parse_api_date accepts YYYYMMDD and YYYY-MM-DD", {
 test_that("parse_api_date handles missing values appropriately", {
   expect_identical(parse_api_date(NA), as.Date(NA))
 })
+
+test_that("date_to_epiweek accepts str and int input", {
+  expect_identical(date_to_epiweek("20200101"), 202001)
+  expect_identical(date_to_epiweek(20200101), 202001)
+})
+
+test_that("date_to_epiweek accepts single and double-digit weeks", {
+  expect_identical(date_to_epiweek(20201101), 202045)
+  expect_identical(date_to_epiweek(20200109), 202002)
+})
+
+test_that("reformat_epirange works in basic cases", {
+  # Week to week
+  result <- reformat_epirange(epirange(202002, 202013), "week")
+  expect_identical(result, epirange(202002, 202013))
+
+  result <- reformat_epirange(epirange("202002", "202013"), "week")
+  expect_identical(result, epirange("202002", "202013"))
+
+  # Week to day
+  # Across year boundary
+  result <- reformat_epirange(epirange(202001, 202013), "day")
+  expect_identical(result, epirange(20191229, 20200322))
+
+  result <- reformat_epirange(epirange(202002, 202013), "day")
+  expect_identical(result, epirange(20200105, 20200322))
+
+  result <- reformat_epirange(epirange("202002", "202013"), "day")
+  expect_identical(result, epirange(20200105, 20200322))
+
+  # Day to week
+  result <- reformat_epirange(epirange(20200201, 20201031), "week")
+  expect_identical(result, epirange(202005, 202044))
+
+  result <- reformat_epirange(epirange("20200201", "20201031"), "week")
+  expect_identical(result, epirange(202005, 202044))
+
+  # Day to day
+  result <- reformat_epirange(epirange(20200201, 20201031), "day")
+  expect_identical(result, epirange(20200201, 20201031))
+
+  result <- reformat_epirange(epirange("20200201", "20201031"), "day")
+  expect_identical(result, epirange("20200201", "20201031"))
+})

tests/testthat/test-model.R

@@ -64,3 +64,27 @@ test_that("check_is_cachable can handle both str and date inputs of various leng
   epidata_call$params$issues <- epirange(as.Date("2022-01-01"), as.Date("2022-02-01"))
   expect_no_error(check_is_cachable(epidata_call, fetch_args))
 })
+
+test_that("get_wildcard_equivalent_dates works in basic cases", {
+  # Week date
+  result <- get_wildcard_equivalent_dates(epirange(202002, 202013), "week")
+  expect_identical(result, epirange(202002, 202013))
+
+  result <- get_wildcard_equivalent_dates(epirange("202002", "202013"), "week")
+  expect_identical(result, epirange("202002", "202013"))
+
+  # Week wildcard
+  result <- get_wildcard_equivalent_dates("*", "week")
+  expect_identical(result, epirange(100001, 300001))
+
+  # Day date
+  result <- get_wildcard_equivalent_dates(epirange(20200201, 20201031), "day")
+  expect_identical(result, epirange(20200201, 20201031))
+
+  result <- get_wildcard_equivalent_dates(epirange("20200201", "20201031"), "day")
+  expect_identical(result, epirange("20200201", "20201031"))
+
+  # Day wildcard
+  result <- get_wildcard_equivalent_dates("*", "day")
+  expect_identical(result, epirange(10000101, 30000101))
+})