Made updates for epi_archive testing.

Author: kenmawer

man/as_epi_archive.Rd

@@ -23,18 +23,49 @@ test_that("Warning against max_version being same as edf's max version",{
 })
 
 test_that("as_of properly grabs the data",{
-  df_as_of <- ea %>%
-    epix_as_of(max_version = as.Date("2020-07-01")) %>%
-    na.omit() %>%
-    as.data.frame()
-    
-  df_filter <- ea$DT %>%
-    filter(version == as.Date("2020-07-01")) %>%
-    na.omit() %>%
-    select(-version) %>%
-    as.data.frame()
+  d <- as.Date("2020-06-01")
 
-  expect_equal(df_as_of[1:4],df_filter)
+  generate_time_values <- function() {
+    x <- c()
+    for (i in 0:3) {
+      x <- c(rep(d+i,4),x)
+    }
+    return(rev(x))
+  }
+  
+  generate_versions <- function() {
+    x <- c()
+    for (i in 0:3) {
+      x <- c(d+i,x)
+    }
+    x <- rep(x,4)
+    return(rev(x))
+  }
+  
+  ea2 <- tibble(
+    geo_value = "ca",
+    time_value = generate_time_values(),
+    version = generate_versions()
+  ) %>%
+    filter(version >= time_value)
+  
+  ea2 <- ea2[-c(9,4,3),]
+  ea2 <- bind_cols(ea2,cases=c(1,2,0,1,2,1,4))
+  ea2 <- as_epi_archive(ea2)
+  
+  df_as_of <- ea2 %>%
+    epix_as_of(max_version = as.Date("2020-06-03")) %>%
+    as_tibble()
+  
+  df_expected <- tibble(
+    geo_value = "ca",
+    time_value = d + 0:2,
+    cases = c(2,1,1)
+  )
+  
+  expect_identical(df_as_of[[1]],df_expected[[1]])
+  expect_identical(df_as_of[[2]],df_expected[[2]])
+  expect_identical(df_as_of[[3]],df_expected[[3]])
 })
 
 # epix_merge tests
@@ -50,7 +81,7 @@ test_that("data.table merging is utilized if second argument is a data.table",{
 
   expect_identical(
     epix_merge(ea1,dt2),
-    merge(dt1,dt2)
+    merge(dt1,dt2,all=TRUE)
   )
 })
 
@@ -62,6 +93,6 @@ test_that("data.table merging works as intended",{
 
   expect_identical(
     as_epi_archive(ea$DT),
-    as_epi_archive(merge(dt1,dt2))
+    as_epi_archive(merge(dt1,dt2,all=TRUE))
   )
 })