Force module instantiation before execution in unit tests

OHDSI · Aug 17, 2023 · deab430 · deab430
1 parent 839b46a
commit deab430
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -15,7 +15,7 @@ License: Apache License 2.0
 URL: https://ohdsi.github.io/Strategus, https://github.com/OHDSI/Strategus
 BugReports: https://github.com/OHDSI/Strategus/issues
 Depends:
-	R (>= 4.2.3),
+	R (>= 4.2.0),
 	CohortGenerator (>= 0.8.0),
 	DatabaseConnector (>= 6.2.3)
 Imports:

diff --git a/tests/testthat/test-Strategus.R b/tests/testthat/test-Strategus.R
@@ -20,13 +20,16 @@ test_that("Run Eunomia study", {
     )
   )
 
+  # Ensure all of the modules are instantiated
+  analysisSpecifications$moduleSpecifications <- analysisSpecifications$moduleSpecifications[-c(2:length(analysisSpecifications$moduleSpecifications))]
+  ensureAllModulesInstantiated(analysisSpecifications)
+
   # Create a unique set of cohort tables for this test run and
   # ensure they are removed when complete
   cohortTableNames <- CohortGenerator::getCohortTableNames(cohortTable = paste0("s", tableSuffix))
 
   # Use this line to limit to only running the CohortGeneratorModule
   # for testing purposes.
-  analysisSpecifications$moduleSpecifications <- analysisSpecifications$moduleSpecifications[-c(2:length(analysisSpecifications$moduleSpecifications))]
   executionSettings <- createCdmExecutionSettings(
     connectionDetailsReference = dbms,
     workDatabaseSchema = workDatabaseSchema,