Move cohort table name call to setup

OHDSI · Jan 17, 2024 · 1e96f0d · 1e96f0d
1 parent b6b6bb6
commit 1e96f0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -68,15 +68,15 @@ withr::defer(
 cdmDatabaseSchema <- "main"
 workDatabaseSchema <- "main"
 vocabularyDatabaseSchema <- workDatabaseSchema
-cohortTable <- "cohort"
+cohortTableNames <- CohortGenerator::getCohortTableNames(cohortTable = paste0("s", tableSuffix))
 tempEmulationSchema <- NULL
 
 connectionDetailsList[[length(connectionDetailsList) + 1]] <- list(
   connectionDetails = connectionDetails,
   cdmDatabaseSchema = "main",
   workDatabaseSchema = "main",
   vocabularyDatabaseSchema = "main",
-  cohortTable = "cohort",
+  cohortTableNames = cohortTableNames,
   tempEmulationSchema = NULL
 )
 #

diff --git a/tests/testthat/test-Strategus.R b/tests/testthat/test-Strategus.R
@@ -28,6 +28,7 @@ test_that("Run unit test study", {
     workDatabaseSchema <- connectionDetailsList[[i]]$workDatabaseSchema
     cdmDatabaseSchema <- connectionDetailsList[[i]]$cdmDatabaseSchema
     tempEmulationSchema <- connectionDetailsList[[i]]$tempEmulationSchema
+    cohortTableNames <- connectionDetailsList[[i]]$cohortTableNames
     studyRootFolder <- file.path(tempDir, "EunomiaTestStudy", dbms)
     workFolder <- file.path(studyRootFolder, "work_folder")
     resultsFolder <- file.path(studyRootFolder, "results_folder")
@@ -72,7 +73,7 @@ test_that("Run unit test study", {
       workDatabaseSchema = workDatabaseSchema,
       cdmDatabaseSchema = cdmDatabaseSchema,
       tempEmulationSchema = tempEmulationSchema,
-      cohortTableNames = CohortGenerator::getCohortTableNames(cohortTable = paste0("s", tableSuffix)),
+      cohortTableNames = cohortTableNames,
       workFolder = workFolder,
       resultsFolder = resultsFolder,
       minCellCount = 5,