DateTime Picker : Do not enable time input if date textfield is empty…

…, do not show error message if date input is valid. (#1871) * Do not enable time input if date textfield is empty, do not show error message id date input is valid. * Address review comments. * Address inline comments. * Avoid duplication of invalid date error text. * Address inline comment. * Address review comments. * address my own comments * BREAKS: rebind if draft answer changes * Fix build failure. * Rename test case and add one more assertion. * breaking: cleaned up date time picker * clear text on imporper answer * disable time at the start * use text in datebox to set datetime * set edti text in date * breaking: fix time disappering * cleaner code * init textwatcher once * dont clear answer in change text * simplify even more * remove unneessary method * fix tests * fix tests * final refactor * final final comment fixes * enable time picker on cal choosing date * add a UI test to check if the answer gets saved * Address comments * address comments and cleanup tests --------- Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: omarismail <[email protected]>
google · Feb 22, 2023 · a9d95db · a9d95db
1 parent aff90f1
commit a9d95db
Show file tree

Hide file tree

Showing 7 changed files with 282 additions and 344 deletions.
diff --git a/datacapture/sampledata/component_date_time_picker.json b/datacapture/sampledata/component_date_time_picker.json
@@ -0,0 +1,30 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Schedule an appointment",
+      "type": "dateTime",
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "1-most-recent",
+          "text": "Select a date 4 weeks from now",
+          "type": "display"
+        }
+      ]
+    }
+  ]
+}
diff --git a/...e/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/...e/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -21,6 +21,7 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.add
 import androidx.fragment.app.commitNow
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
@@ -29,9 +30,13 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.QUESTIONNAIRE_FILE_PATH_KEY
 import com.google.android.fhir.datacapture.test.R
+import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.utilities.clickOnText
+import com.google.android.fhir.datacapture.views.localDateTime
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
+import java.time.LocalDateTime
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -54,30 +59,23 @@ class QuestionnaireUiEspressoTest {
 
   @Test
   fun shouldDisplayReviewButtonWhenNoMorePagesToDisplay() {
-    val bundle =
-      bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to "/paginated_questionnaire_with_dependent_answer.json")
-    activityScenarioRule.scenario.onActivity { activity ->
-      activity.supportFragmentManager.commitNow {
-        setReorderingAllowed(true)
-        add<TestQuestionnaireFragment>(R.id.container_holder, args = bundle)
-      }
-    }
+    buildFragmentFromQuestionnaire("/paginated_questionnaire_with_dependent_answer.json")
 
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(
           ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
         )
       )
 
     clickOnText("Yes")
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE))
       )
 
     clickOnText("No")
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(
           ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
@@ -87,17 +85,86 @@ class QuestionnaireUiEspressoTest {
 
   @Test
   fun integerTextEdit_inputOutOfRange_shouldShowError() {
-    val bundle = bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to "/text_questionnaire_integer.json")
+    buildFragmentFromQuestionnaire("/text_questionnaire_integer.json")
+
+    onView(withId(R.id.text_input_edit_text)).perform(typeText("12345678901"))
+    onView(withId(R.id.text_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo("Number must be between -2,147,483,648 and 2,147,483,647")
+    }
+  }
+
+  @Test
+  fun dateTimePicker_shouldShowErrorForWrongDate() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    // Add month and day. No need to add slashes as they are added automatically
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("0105"))
+
+    onView(withId(R.id.date_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
+    }
+    onView(withId(R.id.time_input_layout)).check { view, _ -> assertThat(view.isEnabled).isFalse() }
+  }
+
+  @Test
+  fun dateTimePicker_shouldEnableTimePickerWithCorrectDate_butNotSaveInQuestionnaireResponse() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("01052005"))
+
+    onView(withId(R.id.date_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo(null)
+    }
+
+    onView(withId(R.id.time_input_layout)).check { view, _ -> assertThat(view.isEnabled).isTrue() }
+
+    assertThat(getQuestionnaireResponse().item.size).isEqualTo(1)
+    assertThat(getQuestionnaireResponse().item.first().answer.size).isEqualTo(0)
+  }
+
+  @Test
+  fun dateTimePicker_shouldSetAnswerWhenDateAndTimeAreFilled() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("01052005"))
+
+    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
+    clickOnText("AM")
+    clickOnText("6")
+    clickOnText("10")
+    clickOnText("OK")
+
+    val answer = getQuestionnaireResponse().item.first().answer.first().valueDateTimeType
+
+    assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 6, 10))
+  }
+
+  private fun buildFragmentFromQuestionnaire(fileName: String) {
+    val bundle = bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to fileName)
     activityScenarioRule.scenario.onActivity { activity ->
       activity.supportFragmentManager.commitNow {
         setReorderingAllowed(true)
         add<TestQuestionnaireFragment>(R.id.container_holder, args = bundle)
       }
     }
-    onView(withId(R.id.text_input_edit_text)).perform(typeText("12345678901"))
-    onView(withId(R.id.text_input_layout)).check { view, _ ->
-      val actualError = (view as TextInputLayout).error
-      assertThat(actualError).isEqualTo("Number must be between -2,147,483,648 and 2,147,483,647")
+  }
+  private fun getQuestionnaireResponse(): QuestionnaireResponse {
+    var testQuestionnaireFragment: QuestionnaireFragment? = null
+    activityScenarioRule.scenario.onActivity { activity ->
+      testQuestionnaireFragment =
+        activity.supportFragmentManager
+          .findFragmentById(R.id.container_holder)
+          ?.childFragmentManager?.findFragmentById(R.id.container) as QuestionnaireFragment
     }
+    return testQuestionnaireFragment!!.getQuestionnaireResponse()
   }
 }
diff --git a/...id/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt b/...id/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
@@ -18,7 +18,6 @@ package com.google.android.fhir.datacapture.views
 
 import android.view.View
 import android.widget.FrameLayout
-import android.widget.TextView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -33,7 +32,6 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.common.truth.Truth.assertThat
 import org.hamcrest.CoreMatchers.allOf
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -54,95 +52,11 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
   private lateinit var viewHolder: QuestionnaireItemViewHolder
   @Before
   fun setup() {
-    activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
+    activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
     viewHolder = QuestionnaireItemDateTimePickerViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
-  @Test
-  fun shouldSetFirstDateInputThenTimeInput() {
-    val questionnaireItemView =
-      QuestionnaireItemViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isEmpty()
-
-    onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-  }
-
-  @Test
-  fun shouldSetFirstTimeInputThenDateInput() {
-    val questionnaireItemView =
-      QuestionnaireItemViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isEmpty()
-
-    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-    onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-  }
-
   @Test
   fun showsTimePickerInInputMode() {
     val questionnaireItemView =
@@ -189,12 +103,12 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
 
   /** Method to run code snippet on UI/main thread */
   private fun runOnUI(action: () -> Unit) {
-    activityScenarioRule.getScenario().onActivity { activity -> action() }
+    activityScenarioRule.scenario.onActivity { activity -> action() }
   }
 
   /** Method to set content view for test activity */
   private fun setTestLayout(view: View) {
-    activityScenarioRule.getScenario().onActivity { activity -> activity.setContentView(view) }
+    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
     InstrumentationRegistry.getInstrumentation().waitForIdleSync()
   }
 }
diff --git a/...com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt b/...com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.views
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
@@ -183,16 +184,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         } catch (e: ParseException) {
           displayValidationResult(
             Invalid(
-              listOf(
-                textInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "31")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
+              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
             )
           )
           if (questionnaireItemViewItem.answers.isNotEmpty()) {
@@ -213,7 +205,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         val textToDisplayInTheTextField =
           answer?.format(canonicalizedDatePattern) ?: draftAnswerToDisplay
 
-        // Since pull request #1822 has been merged, the same date format style is now used for both
+        // The same date format style is now used for both
         // accepting user date input and displaying the answer in the text field. For instance, the
         // "MM/dd/yyyy" format is employed to accept and display the date value. As a result, it is
         // possible to simply compare
@@ -228,16 +220,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         if (!draftAnswerToDisplay.isNullOrBlank()) {
           displayValidationResult(
             Invalid(
-              listOf(
-                textInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "31")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
+              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
             )
           )
         } else {
@@ -351,3 +334,14 @@ internal fun Int.length() =
     0 -> 1
     else -> log10(abs(toDouble())).toInt() + 1
   }
+
+/**
+ * Replaces 'dd' with '31', 'MM' with '01' and 'yyyy' with '2023' and returns new string. For
+ * example, given a `formatPattern` of dd/MM/yyyy, returns 31/01/2023
+ */
+internal fun invalidDateErrorText(context: Context, formatPattern: String) =
+  context.getString(
+    R.string.date_format_validation_error_msg,
+    formatPattern,
+    formatPattern.replace("dd", "31").replace("MM", "01").replace("yyyy", "2023")
+  )