Add #validateAnswerConstraint to FormCOntroller

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryViewModel.java

@@ -30,7 +30,6 @@
 import org.odk.collect.android.javarosawrapper.FailedValidationResult;
 import org.odk.collect.android.javarosawrapper.FormController;
 import org.odk.collect.android.javarosawrapper.RepeatsInFieldListException;
-import org.odk.collect.android.javarosawrapper.SuccessValidationResult;
 import org.odk.collect.android.javarosawrapper.ValidationResult;
 import org.odk.collect.android.logic.ImmutableDisplayableQuestion;
 import org.odk.collect.android.utilities.Appearances;
@@ -394,12 +393,8 @@ public void exit() {
 
     public void validateAnswerConstraint(FormIndex index, IAnswerData answer) {
         worker.immediate(() -> {
-            boolean isAnswerValid = formController.getFormDef().evaluateConstraint(index.getReference(), answer);
-            if (isAnswerValid) {
-                validationResult.postValue(new Consumable<>(SuccessValidationResult.INSTANCE));
-            } else {
-                validationResult.postValue(new Consumable<>(formController.getFailedValidationResult(index, FormEntryController.ANSWER_CONSTRAINT_VIOLATED)));
-            }
+            ValidationResult result = formController.validateAnswerConstraint(index, answer);
+            validationResult.postValue(new Consumable<>(result));
         });
     }
 

collect_app/src/main/java/org/odk/collect/android/javarosawrapper/FormController.kt

@@ -129,6 +129,14 @@ interface FormController {
     @Throws(JavaRosaException::class)
     fun answerQuestion(index: FormIndex?, data: IAnswerData?): Int
 
+    /**
+     * Validates a single answer against its constraint.
+     *
+     * @return SuccessValidationResult if the answer is valid, or an error result describing
+     * the violated constraint.
+     */
+    fun validateAnswerConstraint(index: FormIndex, answer: IAnswerData?): ValidationResult
+
     /**
      * Goes through the entire form to make sure all entered answers comply with their constraints.
      * Constraints are ignored on 'jump to', so answers can be outside of constraints. We don't
@@ -140,8 +148,6 @@ interface FormController {
     @Throws(JavaRosaException::class)
     fun validateAnswers(moveToInvalidIndex: Boolean): ValidationResult
 
-    fun getFailedValidationResult(index: FormIndex, status: Int): ValidationResult
-
     /**
      * saveAnswer attempts to save the current answer into the data model without doing any
      * constraint checking. Only use this if you know what you're doing. For normal form filling

collect_app/src/main/java/org/odk/collect/android/javarosawrapper/JavaRosaFormController.java

@@ -393,6 +393,15 @@ public int answerQuestion(FormIndex index, IAnswerData data) throws JavaRosaExce
         }
     }
 
+    public ValidationResult validateAnswerConstraint(FormIndex index, IAnswerData answer) {
+        boolean isAnswerValid = getFormDef().evaluateConstraint(index.getReference(), answer);
+        if (isAnswerValid) {
+            return SuccessValidationResult.INSTANCE;
+        } else {
+            return getFailedValidationResult(index, FormEntryController.ANSWER_CONSTRAINT_VIOLATED);
+        }
+    }
+
     public ValidationResult validateAnswers(boolean moveToInvalidIndex) throws JavaRosaException {
         try {
             ValidateOutcome validateOutcome = getFormDef().validate();
@@ -411,8 +420,7 @@ public ValidationResult validateAnswers(boolean moveToInvalidIndex) throws JavaR
         }
     }
 
-    @Override
-    public ValidationResult getFailedValidationResult(FormIndex index, int status) {
+    private ValidationResult getFailedValidationResult(FormIndex index, int status) {
         ValidationResult validationResult = null;
 
         String errorMessage;

collect_app/src/test/java/org/odk/collect/android/javarosawrapper/FakeFormController.java

@@ -129,20 +129,20 @@ public FormEntryPrompt getQuestionPrompt() {
         return currentPrompts.get(0);
     }
 
-    @NonNull
     @Override
-    public ValidationResult validateAnswers(boolean moveToInvalidIndex) throws JavaRosaException {
-        if (validationError != null) {
-            throw validationError;
+    public @NotNull ValidationResult validateAnswerConstraint(@NotNull FormIndex index, @Nullable IAnswerData answer) {
+        if (failedConstraint != null) {
+            return failedConstraint;
         } else {
             return SuccessValidationResult.INSTANCE;
         }
     }
 
+    @NonNull
     @Override
-    public @NotNull ValidationResult getFailedValidationResult(@NotNull FormIndex index, int status) {
-        if (failedConstraint != null) {
-            return failedConstraint;
+    public ValidationResult validateAnswers(boolean moveToInvalidIndex) throws JavaRosaException {
+        if (validationError != null) {
+            throw validationError;
         } else {
             return SuccessValidationResult.INSTANCE;
         }

collect_app/src/test/java/org/odk/collect/android/utilities/StubFormController.kt

@@ -75,13 +75,11 @@ open class StubFormController : FormController {
 
     override fun answerQuestion(index: FormIndex?, data: IAnswerData?): Int = -1
 
+    override fun validateAnswerConstraint(index: FormIndex, answer: IAnswerData?): ValidationResult = SuccessValidationResult
+
     @Throws(JavaRosaException::class)
     override fun validateAnswers(moveToInvalidIndex: Boolean): ValidationResult = SuccessValidationResult
 
-    override fun getFailedValidationResult(index: FormIndex, status: Int): ValidationResult {
-        return SuccessValidationResult
-    }
-
     override fun saveAnswer(index: FormIndex?, data: IAnswerData?): Boolean = false
 
     override fun stepToNextEvent(stepIntoGroup: Boolean): Int = -1