Fixed rootDir parameter being passed on each test case, rather than operation level

Author: brynrhodes

src/executeCql.ts

@@ -56,8 +56,7 @@ export async function executeCQLFile(uri: Uri): Promise<void> {
         p.path,
         terminologyPath,
         p.name,
-        measurementPeriod,
-        rootDir
+        measurementPeriod
       ),
     );
   }
@@ -81,7 +80,7 @@ export async function executeCQLFile(uri: Uri): Promise<void> {
   await insertLineAtEnd(textEditor, `${terminologyMessage}`);
   await insertLineAtEnd(textEditor, `${testMessage}`);
 
-  let operationArgs = getCqlCommandArgs(fhirVersion, optionsPath);
+  let operationArgs = getCqlCommandArgs(fhirVersion, optionsPath, rootDir);
   operationArgs.push(...testCasesArgs);
   await executeCQL(textEditor, operationArgs);
 }
@@ -157,7 +156,7 @@ async function executeCQL(textEditor: TextEditor, operationArgs: string[]) {
   );
 }
 
-function getCqlCommandArgs(fhirVersion: string, optionsPath: Uri): string[] {
+function getCqlCommandArgs(fhirVersion: string, optionsPath: Uri, rootDir: Uri): string[] {
   const args = ['cql'];
 
   args.push(`-fv=${fhirVersion}`);
@@ -166,6 +165,10 @@ function getCqlCommandArgs(fhirVersion: string, optionsPath: Uri): string[] {
     args.push(`-op=${optionsPath}`);
   }
 
+  if (rootDir) {
+    args.push(`-rd=${rootDir}`);
+  }
+
   return args;
 }
 
@@ -175,8 +178,7 @@ function getExecArgs(
   modelPath: Uri | null,
   terminologyPath: Uri | null,
   contextValue: string | null,
-  measurementPeriod: string,
-  rootDir: Uri,
+  measurementPeriod: string
 ): string[] {
   // TODO: One day we might support other models and contexts
   const modelType = 'FHIR';
@@ -205,9 +207,5 @@ function getExecArgs(
     args.push(`-pv=${measurementPeriod}`);
   }
 
-  if (rootDir) {
-    args.push(`-rd=${rootDir}`);
-  }
-
   return args;
 }