improve error msg if elements are missing in assert_epiparameter

epiverse-trace · Aug 12, 2024 · cdf7356 · cdf7356
1 parent 143d6ab
commit cdf7356
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/R/epiparameter.R b/R/epiparameter.R
@@ -335,14 +335,19 @@ assert_epiparameter <- function(x) {
     stop("Object should be of class epiparameter", call. = FALSE)
   }
 
+  list_names <- c(
+    "disease", "pathogen", "epi_dist", "prob_dist", "uncertainty",
+    "summary_stats", "citation", "metadata", "method_assess", "notes"
+  )
+  missing_list_names <- list_names[!list_names %in% attributes(x)$names]
+  if (length(missing_list_names > 0)) {
+    stop(
+      "Object is missing ", toString(missing_list_names), call. = FALSE
+    )
+  }
+
   # check for class invariants
   stopifnot(
-    "epiparameter object does not contain the correct attributes" =
-      c(
-        "disease", "epi_dist", "prob_dist", "uncertainty", "summary_stats",
-        "citation", "metadata", "method_assess", "notes"
-      ) %in%
-        attributes(x)$names,
     "epiparameter must contain a disease (single character string)" =
     checkmate::test_string(x$disease),
     "epiparameter must contain an epidemiological distribution" =

diff --git a/tests/testthat/test-epiparameter.R b/tests/testthat/test-epiparameter.R
@@ -322,7 +322,7 @@ test_that("assert_epiparameter catches class faults when expected", {
 
   expect_error(
     assert_epiparameter(epiparameter_obj),
-    regexp = "epiparameter object does not contain the correct attributes"
+    regexp = "Object is missing disease"
   )
 
   epiparameter_obj <- new_epiparameter(