fix test

OHDSI · Nov 20, 2023 · 8880772 · 8880772
1 parent a5d1ae1
commit 8880772
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/R/GetCovariatesFromOtherCohorts.R b/R/GetCovariatesFromOtherCohorts.R
@@ -134,10 +134,10 @@ getDbCohortBasedCovariatesData <- function(connection,
     oracleTempSchema = oracleTempSchema,
     cdmDatabaseSchema = cdmDatabaseSchema,
     cohortTable = cohortTable,
-    cohortId = cohortId,
+    cohortIds = cohortIds,
     cdmVersion = cdmVersion,
     rowIdField = rowIdField,
-    detailledSettings,
+    covariateSettings = detailledSettings,
     aggregated = aggregated
   )
 

diff --git a/extras/CohortBasedCovariatesVignetteDataFetch.R b/extras/CohortBasedCovariatesVignetteDataFetch.R
@@ -65,7 +65,7 @@ covariateData <- getDbCovariateData(connectionDetails = connectionDetails,
                                     cdmDatabaseSchema = cdmDatabaseSchema,
                                     cohortDatabaseSchema = cohortDatabaseSchema,
                                     cohortTable = cohortTable,
-                                    cohortId = 1,
+                                    cohortIds = c(1),
                                     rowIdField = "subject_id",
                                     covariateSettings = covariateSettings)
 
@@ -97,7 +97,7 @@ covariateData <- getDbCovariateData(connectionDetails = connectionDetails,
                                     cdmDatabaseSchema = cdmDatabaseSchema,
                                     cohortDatabaseSchema = cohortDatabaseSchema,
                                     cohortTable = cohortTable,
-                                    cohortId = 1,
+                                    cohortIds = c(1),
                                     rowIdField = "subject_id",
                                     covariateSettings = covariateSettingsList,
                                     aggregated = TRUE)

diff --git a/tests/testthat/test-GetCohortBasedCovariates.R b/tests/testthat/test-GetCohortBasedCovariates.R
@@ -95,7 +95,7 @@ runCohortBasedBinaryNonAggTest <- function(connection, cdmDatabaseSchema, ohdsiD
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -137,7 +137,7 @@ runCohortBasedBinaryAggTest <- function(connection, cdmDatabaseSchema, ohdsiData
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -180,7 +180,7 @@ runCohortBasedBinaryNonAggTemporalTest <- function(connection, cdmDatabaseSchema
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -224,7 +224,7 @@ runCohortBasedBinaryAggTemporalTest <- function(connection, cdmDatabaseSchema, o
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -271,7 +271,7 @@ runCohortBasedCountsNonAggTest <- function(connection, cdmDatabaseSchema, ohdsiD
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTable = cohortTable,
     cohortTableIsTemp = tempTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -315,7 +315,7 @@ runCohortBasedCountsAggTest <- function(connection, cdmDatabaseSchema, ohdsiData
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -361,7 +361,7 @@ runCohortBasedCountsNonAggTemporalTest <- function(connection, cdmDatabaseSchema
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -406,7 +406,7 @@ runCohortBasedCountsAggTemporalTest <- function(connection, cdmDatabaseSchema, o
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTable = cohortTable,
     cohortTableIsTemp = tempTable,
-    cohortId = 1,
+    cohortIds = c(1),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,
@@ -455,7 +455,7 @@ runCohortBasedCountsAggMultiCohortTest <- function(connection, cdmDatabaseSchema
     cohortDatabaseSchema = ohdsiDatabaseSchema,
     cohortTableIsTemp = tempTable,
     cohortTable = cohortTable,
-    cohortId = c(1, 101),
+    cohortIds = c(1, 101),
     cdmVersion = "5",
     rowIdField = "subject_id",
     covariateSettings = settings,