2nd try

OHDSI · Sep 19, 2023 · 2d1ac30 · 2d1ac30
1 parent 118933c
commit 2d1ac30
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/tests/testthat/test-Strategus.R b/tests/testthat/test-Strategus.R
@@ -45,14 +45,25 @@ test_that("Run unit test study", {
 
     # Only run this code if we're testing on SQLite
     # AND we're not running code coverage checks
-    if (dbms == "sqlite" && identical(tolower(Sys.getenv("R_COVR")), "false")) {
+    if (dbms == "sqlite" && !identical(tolower(Sys.getenv("R_COVR")), "true")) {
       resultsConnectionDetailsReference <- "result-store"
       resultsDatabaseSchema <- "main"
       Strategus::storeConnectionDetails(
         connectionDetails,
         resultsConnectionDetailsReference,
         keyringName = keyringName
       )
+      resultsExecutionSettings <- Strategus::createResultsExecutionSettings(
+        resultsConnectionDetailsReference = resultsConnectionDetailsReference,
+        resultsDatabaseSchema = resultsDatabaseSchema,
+        workFolder = workFolder,
+        resultsFolder = resultsFolder
+      )
+      Strategus::createResultDataModels(
+        analysisSpecifications = analysisSpecifications,
+        executionSettings = resultsExecutionSettings,
+        keyringName = keyringName
+      )
     }
 
     executionSettings <- createCdmExecutionSettings(
@@ -80,20 +91,6 @@ test_that("Run unit test study", {
       fileName = file.path(studyRootFolder, "eunomiaExecutionSettings.json")
     )
 
-    if (dbms == "sqlite") {
-      resultsExecutionSettings <- Strategus::createResultsExecutionSettings(
-        resultsConnectionDetailsReference = resultsConnectionDetailsReference,
-        resultsDatabaseSchema = resultsDatabaseSchema,
-        workFolder = workFolder,
-        resultsFolder = resultsFolder
-      )
-      Strategus::createResultDataModels(
-        analysisSpecifications = analysisSpecifications,
-        executionSettings = resultsExecutionSettings,
-        keyringName = keyringName
-      )
-    }
-
     Strategus::execute(
       analysisSpecifications = analysisSpecifications,
       executionSettings = executionSettings,