honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #903 from dgileadi/902-fix-bounds-exception 

Fix #902, IndexOutOfBoundsException for DSTU2 QuestionnaireResponses with groups
This commit is contained in:
James Agnew 2018-05-04 08:49:17 -04:00 committed by GitHub
parent a62718692f 3b724107ff
commit f092caf386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/validation/QuestionnaireResponseValidator.java
View File

@ -245,7 +245,7 @@ public class QuestionnaireResponseValidator extends BaseValidator {
}
}
for (org.hl7.fhir.instance.model.QuestionnaireResponse.GroupComponent nextAnswerGroup : answerGroups) {
int index = theAnswerGroups.indexOf(answerGroups.get(1));
int index = theAnswerGroups.indexOf(nextAnswerGroup);
thePathStack.add("group(" + index + ")");
validateGroup(theErrors, nextQuestionGroup, nextAnswerGroup, thePathStack, theAnswers, theValidateRequired);
thePathStack.removeLast();

29
hapi-fhir-validation/src/test/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidatorTest.java
View File

@ -17,8 +17,11 @@ import org.apache.commons.io.IOUtils;
import org.hl7.fhir.instance.model.DateType;
import org.hl7.fhir.instance.model.Observation;
import org.hl7.fhir.instance.model.Observation.ObservationStatus;
import org.hl7.fhir.instance.model.Questionnaire;
import org.hl7.fhir.instance.model.Questionnaire.AnswerFormat;
import org.hl7.fhir.instance.model.QuestionnaireResponse;
import org.hl7.fhir.instance.model.QuestionnaireResponse.QuestionnaireResponseStatus;
import org.hl7.fhir.instance.model.Reference;
import org.hl7.fhir.instance.model.StringType;
import org.junit.AfterClass;
import org.junit.Ignore;
@ -223,6 +226,32 @@ public class FhirInstanceValidatorTest {
assertTrue(result.isSuccessful());
}
@Test
public void testQuestionnaireResponseValidator() {
final Questionnaire q = new Questionnaire();
q.getGroup().addGroup().setLinkId("group1").addQuestion().setLinkId("foo").setType(AnswerFormat.BOOLEAN);
q.getGroup().addQuestion().setLinkId("bar").setType(AnswerFormat.TEXT);
QuestionnaireResponse qr = new QuestionnaireResponse();
qr.setStatus(QuestionnaireResponseStatus.COMPLETED);
qr.getGroup().addGroup().setLinkId("group1").addQuestion().setLinkId("foo");
qr.getGroup().addQuestion().setLinkId("bar");
qr.setQuestionnaire(new Reference("#q"));
qr.getQuestionnaire().setResource(q);
FhirValidator val = ourCtxHl7OrgDstu2.newValidator();
FhirQuestionnaireResponseValidator module = new FhirQuestionnaireResponseValidator();
val.registerValidatorModule(module);
ValidationResult result = val.validateWithResult(qr);
String encoded = ourCtxHl7OrgDstu2.newJsonParser().setPrettyPrint(true).encodeResourceToString(result.toOperationOutcome());
ourLog.info(encoded);
assertTrue(result.isSuccessful());
}
@AfterClass
public static void afterClassClearContext() {