Merge pull request #6273 from grzesiek2010/COLLECT-6266

Fixed hiding error in external widgets
getodk · Jul 22, 2024 · b44e199 · b44e199
2 parents 8dcf4f9 + 6649c62
commit b44e199
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/ExStringWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/ExStringWidget.java
@@ -236,6 +236,7 @@ private void onException(String toastText) {
 
     @Override
     public void hideError() {
+        super.hideError();
         binding.widgetAnswerText.setError(null);
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java
@@ -75,7 +75,7 @@ public abstract class QuestionWidget extends FrameLayout implements Widget {
     private final View guidanceTextLayout;
     private final View textLayout;
     private final TextView warningText;
-    protected final View errorLayout;
+    public final View errorLayout;
     protected final Settings settings;
     private AtomicBoolean expanded;
     protected final ThemeUtils themeUtils;

diff --git a/...ect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java b/...ect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java
@@ -3,6 +3,7 @@
 import static junit.framework.Assert.assertTrue;
 
 import android.view.View;
+import android.widget.TextView;
 
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
@@ -11,6 +12,7 @@
 import org.odk.collect.android.widgets.ExStringWidget;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.when;
 
@@ -64,6 +66,26 @@ public void widgetShouldBeRegisteredForContextMenu() {
         assertThat(viewsRegisterForContextMenu.get(1).getId(), is(widget.getId()));
     }
 
+    @Test
+    public void errorDisappearsOnSetData() {
+        ExStringWidget widget = getWidget();
+        widget.displayError("blah");
+        widget.setData("answer");
+
+        assertThat(widget.errorLayout.getVisibility(), equalTo(TextView.GONE));
+        assertThat(widget.getBackground(), equalTo(null));
+    }
+
+    @Test
+    public void errorDisappearsOnAddingAnswerManuallyViaTheTextField() {
+        ExStringWidget widget = getWidget();
+        widget.displayError("blah");
+        widget.binding.widgetAnswerText.getBinding().editText.setText("answer");
+
+        assertThat(widget.errorLayout.getVisibility(), equalTo(TextView.GONE));
+        assertThat(widget.getBackground(), equalTo(null));
+    }
+
     @Test
     public abstract void verifyInputType();
 }