Fix null pointer exception for max length validator (#618)

* Fix null pointer exception for max validator * Simply the tests
google · Jul 1, 2021 · e806c90 · e806c90
1 parent 916cf74
commit e806c90
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/...a/com/google/android/fhir/datacapture/validation/PrimitiveTypeAnswerMaxLengthValidator.kt b/...a/com/google/android/fhir/datacapture/validation/PrimitiveTypeAnswerMaxLengthValidator.kt
@@ -35,10 +35,13 @@ internal object PrimitiveTypeAnswerMaxLengthValidator : ConstraintValidator {
     context: Context
   ): ConstraintValidationResult {
     // TODO(https://github.com/google/android-fhir/issues/487): Validate all answers.
-    val answer = questionnaireResponseItem.answer[0].value
+    val answer =
+      questionnaireResponseItem.answer.singleOrNull()
+        ?: return ConstraintValidationResult(true, null)
+
     if (questionnaireItem.hasMaxLength() &&
-        answer.isPrimitive &&
-        answer.asStringValue().length > questionnaireItem.maxLength
+        answer.value.isPrimitive &&
+        answer.value.asStringValue().length > questionnaireItem.maxLength
     ) {
       return ConstraintValidationResult(
         false,

diff --git a/...m/google/android/fhir/datacapture/validation/PrimitiveTypeAnswerMaxLengthValidatorTest.kt b/...m/google/android/fhir/datacapture/validation/PrimitiveTypeAnswerMaxLengthValidatorTest.kt
@@ -51,6 +51,19 @@ class PrimitiveTypeAnswerMaxLengthValidatorTest {
     context = ApplicationProvider.getApplicationContext()
   }
 
+  @Test
+  fun noAnswer_shouldReturnValidResult() {
+    val validationResult =
+      PrimitiveTypeAnswerMaxLengthValidator.validate(
+        Questionnaire.QuestionnaireItemComponent().apply { this.maxLength = maxLength },
+        QuestionnaireResponseItemComponent(),
+        Companion.context
+      )
+
+    assertThat(validationResult.isValid).isTrue()
+    assertThat(validationResult.message.isNullOrBlank()).isTrue()
+  }
+
   @Test
   fun boolean_answerOverMaxLength_shouldReturnInvalidResult() {
     checkAnswerOverMaxLength(maxLength = 4, value = BooleanType(false))