Do not support the masked appearance in numeric questions

collect_app/src/main/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessor.kt

@@ -27,11 +27,8 @@ object QuestionAnswerProcessor {
 
         if (!fep.answerText.isNullOrBlank() &&
             Appearances.isMasked(fep) &&
-            fep.controlType == Constants.CONTROL_INPUT && (
-                fep.dataType == Constants.DATATYPE_TEXT ||
-                    fep.dataType == Constants.DATATYPE_INTEGER ||
-                    fep.dataType == Constants.DATATYPE_DECIMAL
-            )
+            fep.controlType == Constants.CONTROL_INPUT &&
+            fep.dataType == Constants.DATATYPE_TEXT
         ) {
             return "••••••••••"
         }

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

@@ -16,6 +16,7 @@
 package org.odk.collect.android.utilities
 
 import android.content.res.Configuration
+import org.javarosa.core.model.Constants
 import org.javarosa.form.api.FormEntryPrompt
 import org.odk.collect.android.dynamicpreload.ExternalDataUtil
 import org.odk.collect.androidshared.utils.ScreenUtils
@@ -195,6 +196,6 @@ object Appearances {
     @JvmStatic
     fun isMasked(prompt: FormEntryPrompt): Boolean {
         val appearance = getSanitizedAppearanceHint(prompt)
-        return appearance.contains(MASKED)
+        return appearance.contains(MASKED) && prompt.dataType == Constants.DATATYPE_TEXT
     }
 }

collect_app/src/test/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessorTest.kt

@@ -27,73 +27,57 @@ class QuestionAnswerProcessorTest {
     }
 
     @Test
-    fun noAnswerShouldBeDisplayedIfItDoesNotExistAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withDataType(it)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withAppearance(Appearances.MASKED)
-                .build()
+    fun noAnswerShouldBeDisplayedIfItDoesNotExistAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withAppearance(Appearances.MASKED)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo(""))
-        }
+        assertThat(answer, equalTo(""))
     }
 
     @Test
-    fun noAnswerShouldBeDisplayedIfItIsEmptyAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withAnswerDisplayText("")
-                .withAppearance(Appearances.MASKED)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withDataType(it)
-                .build()
+    fun noAnswerShouldBeDisplayedIfItIsEmptyAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withAnswerDisplayText("")
+            .withAppearance(Appearances.MASKED)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo(""))
-        }
+        assertThat(answer, equalTo(""))
     }
 
     @Test
-    fun maskedAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withAnswerDisplayText("blah")
-                .withAppearance(Appearances.MASKED)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withDataType(it)
-                .build()
+    fun maskedAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withAnswerDisplayText("blah")
+            .withAppearance(Appearances.MASKED)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo("••••••••••"))
-        }
+        assertThat(answer, equalTo("••••••••••"))
     }
 
     @Test
-    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesOtherThanTextAndNumber() {
+    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesOtherThanText() {
         listOf(
+            Constants.DATATYPE_INTEGER,
+            Constants.DATATYPE_DECIMAL,
             Constants.DATATYPE_DATE_TIME,
             Constants.DATATYPE_DATE,
             Constants.DATATYPE_TIME,
@@ -120,7 +104,7 @@ class QuestionAnswerProcessorTest {
     }
 
     @Test
-    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedButControlTypeIsOtherThanInput() {
+    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesAndControlTypeOtherThanInput() {
         listOf(
             Constants.CONTROL_RANGE,
             Constants.CONTROL_RANK,

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

@@ -19,6 +19,7 @@ import android.content.res.Configuration
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
+import org.javarosa.core.model.Constants
 import org.javarosa.form.api.FormEntryPrompt
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -233,7 +234,8 @@ class AppearancesTest {
     }
 
     @Test
-    fun `useThousandSeparator returns false when 'thousands-sep' appearance is found but mixed with 'masked'`() {
+    fun `useThousandSeparator returns false when 'thousands-sep' appearance is found but mixed with 'masked' for text questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("thousands-sep masked")
         assertFalse(Appearances.useThousandSeparator(formEntryPrompt))
     }
@@ -369,6 +371,7 @@ class AppearancesTest {
 
     @Test
     fun `isMasked returns false when there is no appearance`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         assertFalse(Appearances.isMasked(formEntryPrompt))
 
         whenever(formEntryPrompt.appearanceHint).thenReturn("")
@@ -377,13 +380,25 @@ class AppearancesTest {
 
     @Test
     fun `isMasked returns false when non of supported appearances is found`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("blah")
         assertFalse(Appearances.isMasked(formEntryPrompt))
     }
 
     @Test
-    fun `isMasked returns true when 'masked' appearance is found`() {
+    fun `isMasked returns true when 'masked' appearance is found for text questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("masked")
         assertTrue(Appearances.isMasked(formEntryPrompt))
     }
+
+    @Test
+    fun `isMasked returns false when 'masked' appearance is found for numeric questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_INTEGER)
+        whenever(formEntryPrompt.appearanceHint).thenReturn("masked")
+        assertFalse(Appearances.isMasked(formEntryPrompt))
+
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_DECIMAL)
+        assertFalse(Appearances.isMasked(formEntryPrompt))
+    }
 }

collect_app/src/test/java/org/odk/collect/android/widgets/DecimalWidgetTest.java

@@ -2,25 +2,28 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.QuestionDef;
 import org.javarosa.core.model.data.DecimalData;
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
 
 import java.text.NumberFormat;
 import java.util.Locale;
 import java.util.Random;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -40,6 +43,7 @@ public class DecimalWidgetTest extends GeneralStringWidgetTest<DecimalWidget, De
     @NonNull
     @Override
     public DecimalWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_DECIMAL);
         return new DecimalWidget(activity, new QuestionDetails(formEntryPrompt, readOnlyOverride));
     }
 
@@ -219,12 +223,11 @@ public void verifyInputType() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(SingleLineTransformationMethod.class));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        DecimalWidget widget = getWidget();
-        assertThat(widget.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL));
-        assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }

collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java

@@ -2,11 +2,13 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.DecimalData;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
 import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry;
 import org.odk.collect.android.widgets.utilities.StringRequester;
@@ -16,11 +18,12 @@
 
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -42,6 +45,7 @@ public class ExDecimalWidgetTest extends GeneralExStringWidgetTest<ExDecimalWidg
     @NonNull
     @Override
     public ExDecimalWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_DECIMAL);
         return new ExDecimalWidget(activity, new QuestionDetails(formEntryPrompt), new FakeWaitingForDataRegistry(), stringRequester);
     }
 
@@ -103,13 +107,11 @@ public void verifyInputType() {
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        ExDecimalWidget widget = getWidget();
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL));
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
-        assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }

collect_app/src/test/java/org/odk/collect/android/widgets/ExIntegerWidgetTest.java

@@ -2,19 +2,23 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.IntegerData;
 import org.mockito.Mock;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.junit.Test;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
 import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry;
 import org.odk.collect.android.widgets.utilities.StringRequester;
 
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -33,6 +37,7 @@ public class ExIntegerWidgetTest extends GeneralExStringWidgetTest<ExIntegerWidg
     @NonNull
     @Override
     public ExIntegerWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_INTEGER);
         return new ExIntegerWidget(activity, new QuestionDetails(formEntryPrompt), new FakeWaitingForDataRegistry(), stringRequester);
     }
 
@@ -77,13 +82,11 @@ public void verifyInputType() {
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        ExIntegerWidget widget = getWidget();
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED));
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
-        assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }