Regenerate ES test data and update tests

OHDSI · Aug 29, 2024 · bfec2d8 · bfec2d8
1 parent 33ce405
commit bfec2d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/extras/ESModule-SimulationFunctions.R b/extras/ESModule-SimulationFunctions.R
@@ -1,6 +1,6 @@
 # Copyright 2024 Observational Health Data Sciences and Informatics
 #
-# This file is part of EvidenceSynthesisModule
+# This file is part of Strategus
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Functions used in SimulateResultsForTestin.R
+# Functions used in extras/ESModule-SimulateResultsForTesting.R
 
 library(survival)
 
@@ -201,7 +201,6 @@ simulateEo <- function(exposureId, outcomeId, analysisId, incidenceRateRatio = 1
       mutate(
         exposuresOutcomeSetId = outcomeId,
         covariateId = covariateSettings$outputIds[1],
-        outcomeId = outcomeId,
         analysisId = analysisId,
         databaseId = i
       )

diff --git a/inst/testdata/esmodule/results.sqlite b/inst/testdata/esmodule/results.sqlite
diff --git a/tests/testthat/test-EvidenceSynthesisModule.R b/tests/testthat/test-EvidenceSynthesisModule.R
@@ -112,10 +112,10 @@ test_that("Run module", {
 
 test_that("Skipped analyses as specified", {
   # We specified we didn't want cohort method analysis ID 2 in evidence synthesis ID 2:
-  results <- CohortGenerator::readCsv(file.path(testResultsFolder, "es_cm_result.csv"))
+  results <- CohortGenerator::readCsv(file.path(testResultsFolder, "EvidenceSynthesisModule", "es_cm_result.csv"))
   expect_false(any(results$evidenceSynthesisAnalysisId == 2 & results$analysisId == 2))
 
-  results <- CohortGenerator::readCsv(file.path(testResultsFolder, "es_sccs_result.csv"))
+  results <- CohortGenerator::readCsv(file.path(testResultsFolder, "EvidenceSynthesisModule", "es_sccs_result.csv"))
   expect_false(any(results$evidenceSynthesisAnalysisId == 2 & results$analysisId == 2))
 })