move test back in

Author: ginberg

R/executeDiagnostics.R

@@ -898,8 +898,7 @@ executeDiagnostics <- function(cohortDefinitionSet,
           )
         }
 
-
-        executeCohortCharacterization(
+        runCohortCharacterization(
           connection = connection,
           databaseId = databaseId,
           exportFolder = exportFolder,
@@ -915,8 +914,6 @@ executeDiagnostics <- function(cohortDefinitionSet,
           instantiatedCohorts = instantiatedCohorts,
           incremental = incremental,
           recordKeepingFile = recordKeepingFile,
-          task = "runTemporalCohortCharacterization",
-          jobName = "Temporal Cohort characterization",
           covariateValueFileName = file.path(exportFolder, "temporal_covariate_value.csv"),
           covariateValueContFileName = file.path(exportFolder, "temporal_covariate_value_dist.csv"),
           covariateRefFileName = file.path(exportFolder, "temporal_covariate_ref.csv"),

tests/testthat/hold/test-executeDiagnostics.R tests/testthat/test-executeDiagnostics.R

@@ -10,9 +10,8 @@ for (nm in names(testServers)) {
 
     incrementalFolder <- tempfile()
     dir.create(incrementalFolder)
-    debugonce(executeDiagnostics)
+    
     firstTime <- system.time(
-
       executeDiagnostics(
         cohortDefinitionSet = server$cohortDefinitionSet,
         connectionDetails = server$connectionDetails,
@@ -36,7 +35,7 @@ for (nm in names(testServers)) {
         incremental = TRUE,
         incrementalFolder = incrementalFolder,
         temporalCovariateSettings = server$temporalCovariateSettings,
-        runOnSample = FALSE
+        runFeatureExtractionOnSample = FALSE
       )
     )