From a832b58691f3de7215e8788a0eeba4f95397b119 Mon Sep 17 00:00:00 2001 From: Eeva Turkka Date: Fri, 2 Nov 2018 09:17:35 +0200 Subject: [PATCH] Fixed test cases to make EnableWhen disable questions --- ...uestionnaireResponseValidatorDstu3Test.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java index 160ba53327e..32e9e31a973 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java @@ -306,7 +306,7 @@ public class QuestionnaireResponseValidatorDstu3Test { } @Test - public void testRequiredQuestionWithEnableWhenHasAnswerTrue() { + public void testRequiredQuestionWithEnableWhenHdesQuestionHasAnswerTrue() { Questionnaire q = new Questionnaire(); q.addItem().setLinkId("link0").setRequired(true).setType(QuestionnaireItemType.STRING); @@ -334,7 +334,7 @@ public class QuestionnaireResponseValidatorDstu3Test { ValidationResult errors = myVal.validateWithResult(qa); ourLog.info(errors.toString()); - assertThat(errors.toString(), containsString("No response found for required item link1")); + assertThat(errors.toString(), containsString("No issues")); } @Test @@ -353,9 +353,6 @@ public class QuestionnaireResponseValidatorDstu3Test { enable.setHasAnswer(true); - //q.getItemFirstRep().addEnableWhen(). - //q.addItem().setLinkId("link1").setRequired(true).setType(QuestionnaireItemType.STRING); - QuestionnaireResponse qa = new QuestionnaireResponse(); qa.setStatus(QuestionnaireResponseStatus.COMPLETED); qa.getQuestionnaire().setReference("http://example.com/Questionnaire/q1"); @@ -366,7 +363,7 @@ public class QuestionnaireResponseValidatorDstu3Test { ValidationResult errors = myVal.validateWithResult(qa); ourLog.info(errors.toString()); - assertThat(errors.toString(), containsString("No response found for required item link1")); + assertThat(errors.toString(), containsString("No issues")); } @Test @@ -404,10 +401,10 @@ public class QuestionnaireResponseValidatorDstu3Test { @Test - public void testRequiredQuestionWithEnableWhenHasAnswerFalse() { + public void testRequiredQuestionWithEnableWheHidesRequiredQuestionnHasAnswerFalse() { Questionnaire q = new Questionnaire(); - q.addItem().setLinkId("link0").setRequired(true).setType(QuestionnaireItemType.STRING); + q.addItem().setLinkId("link0").setRequired(false).setType(QuestionnaireItemType.STRING); // create the questionnaire QuestionnaireItemComponent item1 = new QuestionnaireItemComponent(); @@ -425,6 +422,8 @@ public class QuestionnaireResponseValidatorDstu3Test { QuestionnaireResponse qa = new QuestionnaireResponse(); qa.setStatus(QuestionnaireResponseStatus.COMPLETED); qa.getQuestionnaire().setReference("http://example.com/Questionnaire/q1"); + + // link1 should be disabled, because the enableWhen enables it when link0 doesn't haven an answer qa.addItem().setLinkId("link0").addAnswer().setValue(new StringType("FOO")); String reference = qa.getQuestionnaire().getReference(); @@ -432,8 +431,7 @@ public class QuestionnaireResponseValidatorDstu3Test { ValidationResult errors = myVal.validateWithResult(qa); ourLog.info(errors.toString()); - // FIXME: should be no assert, fix the assert - assertThat(errors.toString(), containsString("No response found for required item link2")); + assertThat(errors.toString(), containsString("No issues")); } @Test