From 8edd5a5adafc4597fd58537c815f3710b813baa6 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Mon, 29 Apr 2024 17:40:14 -0700
Subject: [PATCH] refactor: filter and move library calls to testthat.R

---
 tests/testthat.R                          | 2 ++
 tests/testthat/test-archive.R             | 2 --
 tests/testthat/test-autoplot.R            | 3 ---
 tests/testthat/test-compactify.R          | 4 ----
 tests/testthat/test-correlation.R         | 2 --
 tests/testthat/test-data.R                | 2 +-
 tests/testthat/test-epix_slide.R          | 4 +---
 tests/testthat/test-methods-epi_archive.R | 5 +----
 8 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/tests/testthat.R b/tests/testthat.R
index b26d274b5..9b12b76cc 100644
--- a/tests/testthat.R
+++ b/tests/testthat.R
@@ -1,4 +1,6 @@
 library(testthat)
 library(epiprocess)
 
+library(dplyr)
+
 test_check("epiprocess")
diff --git a/tests/testthat/test-archive.R b/tests/testthat/test-archive.R
index 2eba383dd..1291e3c7e 100644
--- a/tests/testthat/test-archive.R
+++ b/tests/testthat/test-archive.R
@@ -1,5 +1,3 @@
-library(dplyr)
-
 test_that("first input must be a data.frame", {
   expect_error(as_epi_archive(c(1, 2, 3), compactify = FALSE),
     regexp = "Must be of type 'data.frame'."
diff --git a/tests/testthat/test-autoplot.R b/tests/testthat/test-autoplot.R
index ba3f8d53c..0e4654eb3 100644
--- a/tests/testthat/test-autoplot.R
+++ b/tests/testthat/test-autoplot.R
@@ -1,7 +1,4 @@
-library(dplyr)
-
 d <- as.Date("2020-01-01")
-
 raw_df_chr <- dplyr::bind_rows(
   dplyr::tibble(geo_value = "ak", time_value = d + 1:5, value = "a"),
   dplyr::tibble(geo_value = "al", time_value = d + 1:5, value = "d")
diff --git a/tests/testthat/test-compactify.R b/tests/testthat/test-compactify.R
index 263d67b7f..042a69ea5 100644
--- a/tests/testthat/test-compactify.R
+++ b/tests/testthat/test-compactify.R
@@ -1,7 +1,3 @@
-library(epiprocess)
-library(data.table)
-library(dplyr)
-
 dt <- archive_cases_dv_subset$DT
 dt <- filter(dt, geo_value == "ca") %>%
   filter(version <= "2020-06-15") %>%
diff --git a/tests/testthat/test-correlation.R b/tests/testthat/test-correlation.R
index fe129616d..985074341 100644
--- a/tests/testthat/test-correlation.R
+++ b/tests/testthat/test-correlation.R
@@ -1,5 +1,3 @@
-library(tibble)
-
 test_that("epi_cor throws an error for a non-epi_df for its first argument", {
   expect_error(epi_cor(1:10, 1, 1))
   expect_error(epi_cor(data.frame(x = 1:10), 1, 1))
diff --git a/tests/testthat/test-data.R b/tests/testthat/test-data.R
index 885f00130..88ecc8c74 100644
--- a/tests/testthat/test-data.R
+++ b/tests/testthat/test-data.R
@@ -1,5 +1,5 @@
 test_that("`archive_cases_dv_subset` is formed successfully", {
-  expect_true(is_epi_archive(archive_cases_dv_subset))
+  expect_class(archive_cases_dv_subset, "epi_archive")
 })
 
 test_that("`delayed_assign_with_unregister_awareness` works as expected on good promises", {
diff --git a/tests/testthat/test-epix_slide.R b/tests/testthat/test-epix_slide.R
index 5c20abc27..547123335 100644
--- a/tests/testthat/test-epix_slide.R
+++ b/tests/testthat/test-epix_slide.R
@@ -1,5 +1,3 @@
-library(dplyr)
-
 test_that("epix_slide only works on an epi_archive", {
   expect_error(epix_slide(data.frame(x = 1)))
 })
@@ -506,7 +504,7 @@ test_that("epix_as_of and epix_slide with long enough window are compatible", {
 
 test_that("epix_slide `f` is passed an ungrouped `epi_archive` when `all_versions=TRUE`", {
   slide_fn <- function(x, gk, rtv) {
-    expect_true(is_epi_archive(x))
+    expect_class(x, "epi_archive")
     return(NA)
   }
 
diff --git a/tests/testthat/test-methods-epi_archive.R b/tests/testthat/test-methods-epi_archive.R
index a5ba48fa0..6686400be 100644
--- a/tests/testthat/test-methods-epi_archive.R
+++ b/tests/testthat/test-methods-epi_archive.R
@@ -1,7 +1,4 @@
-library(dplyr)
-
 ea <- archive_cases_dv_subset
-
 ea2_data <- tibble::tribble(
   ~geo_value, ~time_value, ~version, ~cases,
   "ca", "2020-06-01", "2020-06-01", 1,
@@ -104,7 +101,7 @@ test_that("epix_truncate_version_after returns the same grouping type as input e
 
   ea_as_of <- ea2 %>%
     epix_truncate_versions_after(max_version = as.Date("2020-06-04"))
-  expect_true(is_epi_archive(ea_as_of, grouped_okay = FALSE))
+  expect_class(ea_as_of, "epi_archive")
 
   ea2_grouped <- ea2 %>% group_by(geo_value)