omopgenerics validate

OHDSI · Sep 23, 2024 · 58f42b0 · 58f42b0
1 parent 10e5ddd
commit 58f42b0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/R/stratifyCohorts.R b/R/stratifyCohorts.R
@@ -23,7 +23,7 @@
 #'
 #' cdm$my_cohort <- cdm$cohort1 |>
 #'   addAge(ageGroup = list("child" = c(0, 17), "adult" = c(18, Inf))) |>
-#'   addSex() |>
+#'   addSex(name = "my_cohort") |>
 #'   stratifyCohorts(
 #'     strata = list("sex", c("sex", "age_group")), name = "my_cohort"
 #'   )
@@ -33,7 +33,7 @@
 #' settings(cdm$my_cohort)
 #'
 #' attrition(cdm$my_cohort)
-#' }
+#'}
 stratifyCohorts <- function(cohort,
                             strata,
                             cohortId = NULL,

diff --git a/R/unionCohorts.R b/R/unionCohorts.R
@@ -41,7 +41,8 @@ unionCohorts <- function(cohort,
   cdm <- omopgenerics::validateCdmArgument(omopgenerics::cdmReference(cohort))
   cohortId <- validateCohortId(cohortId, settings(cohort))
   omopgenerics::assertNumeric(gap, integerish = TRUE, min = 0, length = 1)
-  cohortName <- omopgenerics::validateNameArgument(cohortName, validation = "warning")
+  omopgenerics::assertCharacter(cohortName, length = 1, null = TRUE)
+  omopgenerics::assertLogical(keepOriginalCohorts, length = 1)
 
   if (length(cohortId) < 2) {
     cli::cli_abort("Settings of cohort table must contain at least two cohorts.")

diff --git a/man/stratifyCohorts.Rd b/man/stratifyCohorts.Rd
diff --git a/tests/testthat/test-unionCohorts.R b/tests/testthat/test-unionCohorts.R
@@ -4,7 +4,7 @@ test_that("unionCohorts works", {
     omock::mockObservationPeriod() |>
     omock::mockCohort(name = c("cohort1"), numberCohorts = 4)
   cdm <- cdm_local |> copyCdm()
-  # simple example
+   # simple example
   cdm$cohort2 <- unionCohorts(cdm$cohort1, name = "cohort2")
   expect_true(all(
     cdm$cohort2 %>% dplyr::pull("cohort_start_date") %>% sort() ==