Added new tests

getodk · Jul 18, 2024 · 54e27a0 · 54e27a0
1 parent 314c41c
commit 54e27a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java
@@ -84,4 +84,10 @@ public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
         assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
         assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
     }
+
+    @Test
+    public void whenNumberOfRowsSpecifiedEditTextShouldHaveProperNumberOfMinLines() {
+        when(questionDef.getAdditionalAttribute(null, "rows")).thenReturn("5");
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getMinLines(), equalTo(5));
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java
@@ -69,4 +69,11 @@ public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
         assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
         assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
     }
+
+    @Test
+    public void whenNumberOfRowsSpecifiedEditTextShouldHaveProperNumberOfMinLines() {
+        when(questionDef.getAdditionalAttribute(null, "rows")).thenReturn("5");
+        StringWidget widget = getWidget();
+        assertThat(widget.widgetAnswerText.getBinding().editText.getMinLines(), equalTo(5));
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java
@@ -4,10 +4,8 @@
 
 import android.view.View;
 
-import org.javarosa.core.model.QuestionDef;
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.WidgetTestActivity;
 import org.odk.collect.android.widgets.StringWidget;
@@ -25,15 +23,6 @@
 public abstract class GeneralStringWidgetTest<W extends StringWidget, A extends IAnswerData>
         extends QuestionWidgetTest<W, A> {
 
-    @Mock
-    QuestionDef questionDef;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        when(formEntryPrompt.getQuestion()).thenReturn(questionDef);
-    }
-
     @Override
     public void callingClearShouldRemoveTheExistingAnswer() {
         super.callingClearShouldRemoveTheExistingAnswer();

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/base/WidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/base/WidgetTest.java
@@ -37,6 +37,9 @@ public abstract class WidgetTest {
 
     protected final SettingsProvider settingsProvider = TestSettingsProvider.getSettingsProvider();
 
+    @Mock
+    protected QuestionDef questionDef;
+
     @Before
     @OverridingMethodsMustInvokeSuper
     public void setUp() throws Exception {
@@ -48,7 +51,7 @@ public void setUp() throws Exception {
         when(formEntryPrompt.getIndex()).thenReturn(mock(FormIndex.class));
         when(formEntryPrompt.getIndex().toString()).thenReturn("0, 0");
         when(formEntryPrompt.getFormElement()).thenReturn(formElement);
-        when(formEntryPrompt.getQuestion()).thenReturn(mock(QuestionDef.class));
+        when(formEntryPrompt.getQuestion()).thenReturn(questionDef);
     }
 
     @Test