Added tests

getodk · Mar 8, 2024 · 122b53a · 122b53a
1 parent 944cf1a
commit 122b53a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java
@@ -371,6 +371,35 @@ public void validate_whenThereIsAnErrorValidating_setsError() {
         assertThat(viewModel.getError().getValue(), equalTo(new FormError.NonFatal("OH NO")));
     }
 
+    @Test
+    public void doNotUpdateCurrentIndex_whenValidationFails_butTheIndexOfAQuestionThatWeShouldBeMovedToIsTheOneWeCurrentlyDisplay() {
+        Consumable<FailedValidationResult> failedValidationResult =
+                new Consumable<>(new FailedValidationResult(formController.getFormIndex(), 0, null, org.odk.collect.strings.R.string.invalid_answer_error));
+        formController.setFailedConstraint(failedValidationResult.getValue());
+
+        FormIndex oldIndex = viewModel.getCurrentIndex().getValue();
+        viewModel.validate();
+        scheduler.flush();
+
+        FormIndex newIndex = viewModel.getCurrentIndex().getValue();
+        assertThat(oldIndex == newIndex, is(true));
+    }
+
+    @Test
+    public void updateCurrentIndex_whenValidationFails_butTheIndexOfAQuestionThatWeShouldBeMovedToIsNotTheOneWeCurrentlyDisplay() {
+        FormIndex index = new FormIndex(null, formController.getFormIndex().getLocalIndex() + 2, 0, new TreeReference());
+        Consumable<FailedValidationResult> failedValidationResult =
+                new Consumable<>(new FailedValidationResult(index, 0, null, org.odk.collect.strings.R.string.invalid_answer_error));
+        formController.setFailedConstraint(failedValidationResult.getValue());
+
+        FormIndex oldIndex = viewModel.getCurrentIndex().getValue();
+        viewModel.validate();
+        scheduler.flush();
+
+        FormIndex newIndex = viewModel.getCurrentIndex().getValue();
+        assertThat(oldIndex == newIndex, is(false));
+    }
+
     @Test
     public void refresh_whenThereIsASelectOnePrompt_preloadsSelectChoices() {
         formController.setCurrentEvent(FormEntryController.EVENT_QUESTION);

diff --git a/collect_app/src/test/java/org/odk/collect/android/javarosawrapper/FakeFormController.java b/collect_app/src/test/java/org/odk/collect/android/javarosawrapper/FakeFormController.java
@@ -116,6 +116,8 @@ public FormEntryPrompt getQuestionPrompt() {
     public ValidationResult validateAnswers(boolean markCompleted, boolean moveToInvalidIndex) throws JavaRosaException {
         if (validationError != null) {
             throw validationError;
+        } else if (failedConstraint != null) {
+            return failedConstraint;
         } else {
             return SuccessValidationResult.INSTANCE;
         }