Make it clear that #validateAnswer checks constraints only

Author: grzesiek2010

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

@@ -392,7 +392,7 @@ public void exit() {
         changeLocks.getFormsLock().unlock(FORM_ENTRY_TOKEN);
     }
 
-    public void validateAnswer(FormIndex index, IAnswerData answer) {
+    public void validateAnswerConstraint(FormIndex index, IAnswerData answer) {
         worker.immediate(() -> {
             boolean isAnswerValid = formController.getFormDef().evaluateConstraint(index.getReference(), answer);
             if (isAnswerValid) {

collect_app/src/main/java/org/odk/collect/android/widgets/utilities/GeoPolyDialogFragment.kt

@@ -7,7 +7,6 @@ import org.javarosa.core.model.Constants
 import org.javarosa.core.model.data.GeoShapeData
 import org.javarosa.core.model.data.GeoTraceData
 import org.javarosa.core.model.data.IAnswerData
-import org.javarosa.form.api.FormEntryController
 import org.javarosa.form.api.FormEntryPrompt
 import org.odk.collect.android.javarosawrapper.FailedValidationResult
 import org.odk.collect.android.utilities.FormEntryPromptUtils
@@ -67,10 +66,7 @@ class GeoPolyDialogFragment(viewModelFactory: ViewModelProvider.Factory) :
             inputPolygon,
             validationResult.map {
                 val validationResult = it.value
-                if (validationResult is FailedValidationResult &&
-                    validationResult.index == prompt.index &&
-                    validationResult.status == FormEntryController.ANSWER_CONSTRAINT_VIOLATED
-                ) {
+                if (validationResult is FailedValidationResult && validationResult.index == prompt.index) {
                     validationResult.customErrorMessage ?: getString(validationResult.defaultErrorMessage)
                 } else {
                     null

collect_app/src/main/java/org/odk/collect/android/widgets/utilities/WidgetAnswerDialogFragment.kt

@@ -73,7 +73,7 @@ abstract class WidgetAnswerDialogFragment<T : Fragment>(
     }
 
     fun onValidate(answer: IAnswerData?) {
-        formEntryViewModel.validateAnswer(prompt.index, answer)
+        formEntryViewModel.validateAnswerConstraint(prompt.index, answer)
     }
 
     fun onAnswer(answer: IAnswerData?) {

collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java

@@ -457,7 +457,7 @@ public void answerQuestion_savesAnswerToFormController() {
     }
 
     @Test
-    public void validateAnswer_updatesValidationResult() {
+    public void validateAnswerConstraint_updatesValidationResult() {
         FormDef formDef = mock();
         when(formDef.evaluateConstraint(any(), any())).thenReturn(false);
         formController.setFormDef(formDef);
@@ -471,7 +471,7 @@ public void validateAnswer_updatesValidationResult() {
         FailedValidationResult failedValidationResult = new FailedValidationResult(formIndex, 0, null, org.odk.collect.strings.R.string.invalid_answer_error);
         formController.setFailedConstraint(failedValidationResult);
 
-        viewModel.validateAnswer(formIndex, new StringData("answer"));
+        viewModel.validateAnswerConstraint(formIndex, new StringData("answer"));
         scheduler.flush(true);
         assertThat(viewModel.getValidationResult().getValue().getValue(), equalTo(failedValidationResult));
     }

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

@@ -333,7 +333,7 @@ class GeoPolyDialogFragmentTest {
             )
         }
 
-        verify(formEntryViewModel).validateAnswer(prompt.index, geoTraceOf(answer))
+        verify(formEntryViewModel).validateAnswerConstraint(prompt.index, geoTraceOf(answer))
     }
 
     @Test
@@ -354,7 +354,7 @@ class GeoPolyDialogFragmentTest {
             )
         }
 
-        verify(formEntryViewModel).validateAnswer(prompt.index, geoShapeOf(answer))
+        verify(formEntryViewModel).validateAnswerConstraint(prompt.index, geoShapeOf(answer))
     }
 
     @Test
@@ -390,7 +390,7 @@ class GeoPolyDialogFragmentTest {
             )
         }
 
-        verify(formEntryViewModel, never()).validateAnswer(prompt.index, geoTraceOf(answer))
+        verify(formEntryViewModel, never()).validateAnswerConstraint(prompt.index, geoTraceOf(answer))
     }
 
     @Test
@@ -484,21 +484,6 @@ class GeoPolyDialogFragmentTest {
         }
     }
 
-    @Test
-    fun `ignores the validation message if it was triggered by a required but empty answer`() {
-        prompt = MockFormEntryPromptBuilder(prompt)
-            .withDataType(Constants.DATATYPE_GEOTRACE)
-            .build()
-
-        validationResult.value = Consumable(FailedValidationResult(prompt.index, FormEntryController.ANSWER_REQUIRED_BUT_EMPTY, "blah", 0))
-        launcherRule.launchAndAssertOnChild<GeoPolyFragment>(
-            GeoPolyDialogFragment::class,
-            bundleOf(ARG_FORM_INDEX to prompt.index)
-        ) {
-            assertThat(it.invalidMessage.getOrAwaitValue(), equalTo(null))
-        }
-    }
-
     @Test
     fun `uses validation result message for invalidMessage`() {
         prompt = MockFormEntryPromptBuilder(prompt)