Add tests

cqframework · Sep 3, 2024 · bccea4b · bccea4b
1 parent a9a65a8
commit bccea4b
Show file tree

Hide file tree

Showing 10 changed files with 334 additions and 116 deletions.
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/activitydefinition/apply/ApplyRequest.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/activitydefinition/apply/ApplyRequest.java
@@ -51,6 +51,7 @@ public ApplyRequest(
             IBaseBundle data,
             LibraryEngine libraryEngine,
             ModelResolver modelResolver) {
+        checkNotNull(activityDefinition, "expected non-null value for activityDefinition");
         checkNotNull(libraryEngine, "expected non-null value for libraryEngine");
         checkNotNull(modelResolver, "expected non-null value for modelResolver");
         this.activityDefinition = activityDefinition;

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/plandefinition/apply/ApplyRequest.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/plandefinition/apply/ApplyRequest.java
@@ -71,6 +71,7 @@ public ApplyRequest(
             LibraryEngine libraryEngine,
             ModelResolver modelResolver,
             IInputParameterResolver inputParameterResolver) {
+        checkNotNull(planDefinition, "expected non-null value for planDefinition");
         checkNotNull(libraryEngine, "expected non-null value for libraryEngine");
         checkNotNull(modelResolver, "expected non-null value for modelResolver");
         this.planDefinition = planDefinition;
@@ -155,16 +156,7 @@ public GenerateRequest toGenerateRequest(IBaseResource profile) {
 
     public PopulateRequest toPopulateRequest() {
         return new PopulateRequest(
-                "populate",
-                questionnaire,
-                subjectId,
-                null,
-                null,
-                parameters,
-                data,
-                useServerData,
-                libraryEngine,
-                modelResolver);
+                questionnaire, subjectId, null, null, parameters, data, useServerData, libraryEngine, modelResolver);
     }
 
     public IBaseResource getPlanDefinition() {

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/QuestionnaireProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/QuestionnaireProcessor.java
@@ -201,7 +201,6 @@ public IBaseBundle packageQuestionnaire(IBaseResource questionnaire, IBaseParame
     }
 
     public PopulateRequest buildPopulateRequest(
-            String operationName,
             IBaseResource questionnaire,
             String subjectId,
             List<IBase> context,
@@ -214,7 +213,6 @@ public PopulateRequest buildPopulateRequest(
             throw new IllegalArgumentException("Missing required parameter: 'subject'");
         }
         return new PopulateRequest(
-                operationName,
                 questionnaire,
                 Ids.newId(fhirVersion, Ids.ensureIdType(subjectId, SUBJECT_TYPE)),
                 context,
@@ -303,15 +301,7 @@ public IBaseResource populate(
             boolean useServerData,
             LibraryEngine libraryEngine) {
         return populate(buildPopulateRequest(
-                "populate",
-                questionnaire,
-                subjectId,
-                context,
-                launchContext,
-                parameters,
-                data,
-                useServerData,
-                libraryEngine));
+                questionnaire, subjectId, context, launchContext, parameters, data, useServerData, libraryEngine));
     }
 
     public IBaseResource populate(PopulateRequest request) {

diff --git a/...fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/populate/PopulateRequest.java b/...fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/populate/PopulateRequest.java
@@ -20,7 +20,6 @@
 import org.opencds.cqf.fhir.utility.Constants;
 
 public class PopulateRequest implements IQuestionnaireRequest {
-    private final String operationName;
     private final IBaseResource questionnaire;
     private final IIdType subjectId;
     private final List<IBase> context;
@@ -36,7 +35,6 @@ public class PopulateRequest implements IQuestionnaireRequest {
     private IBaseOperationOutcome operationOutcome;
 
     public PopulateRequest(
-            String operationName,
             IBaseResource questionnaire,
             IIdType subjectId,
             List<IBase> context,
@@ -46,9 +44,9 @@ public PopulateRequest(
             boolean useServerData,
             LibraryEngine libraryEngine,
             ModelResolver modelResolver) {
+        checkNotNull(questionnaire, "expected non-null value for questionnaire");
         checkNotNull(libraryEngine, "expected non-null value for libraryEngine");
         checkNotNull(modelResolver, "expected non-null value for modelResolver");
-        this.operationName = operationName;
         this.questionnaire = questionnaire;
         this.subjectId = subjectId;
         this.context = context;
@@ -77,7 +75,7 @@ public PopulateRequest(
 
     @Override
     public String getOperationName() {
-        return operationName;
+        return "populate";
     }
 
     @Override

diff --git a/...in/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessor.java b/...in/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessor.java
@@ -127,8 +127,7 @@ public <R extends IBaseResource> IBaseBundle extract(
                 data,
                 useServerData,
                 libraryEngine,
-                modelResolver,
-                repository.fhirContext());
+                modelResolver);
         var processor = extractProcessor != null ? extractProcessor : new ExtractProcessor();
         return processor.extract(request);
     }

diff --git a/...r/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ExtractRequest.java b/...r/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ExtractRequest.java
@@ -40,20 +40,20 @@ public ExtractRequest(
             IBaseBundle bundle,
             boolean useServerData,
             LibraryEngine libraryEngine,
-            ModelResolver modelResolver,
-            FhirContext fhirContext) {
+            ModelResolver modelResolver) {
+        checkNotNull(questionnaireResponse, "expected non-null value for questionnaireResponse");
         checkNotNull(libraryEngine, "expected non-null value for libraryEngine");
         checkNotNull(modelResolver, "expected non-null value for modelResolver");
         this.questionnaireResponse = questionnaireResponse;
+        this.questionnaire = questionnaire;
         this.subjectId = subjectId;
         this.parameters = parameters;
         this.data = bundle;
         this.useServerData = useServerData;
         this.libraryEngine = libraryEngine;
         this.modelResolver = modelResolver;
-        this.fhirContext = fhirContext;
-        this.fhirVersion = fhirContext.getVersion().getVersion();
-        this.questionnaire = questionnaire;
+        this.fhirContext = this.libraryEngine.getRepository().fhirContext();
+        this.fhirVersion = questionnaireResponse.getStructureFhirVersionEnum();
         this.defaultLibraryUrl = "";
     }