Migrate DateTimePicker widget with both date and time components

Author: LZRS

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt

@@ -23,6 +23,7 @@ import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.hasAnyAncestor
@@ -34,6 +35,8 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.test.performTextReplacement
+import androidx.compose.ui.test.printToLog
 import androidx.fragment.app.commitNow
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
@@ -65,8 +68,8 @@ import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.views.compose.DATE_TEXT_INPUT_FIELD
 import com.google.android.fhir.datacapture.views.compose.EDIT_TEXT_FIELD_TEST_TAG
 import com.google.android.fhir.datacapture.views.compose.HANDLE_INPUT_DEBOUNCE_TIME
+import com.google.android.fhir.datacapture.views.compose.TIME_PICKER_INPUT_FIELD
 import com.google.android.material.progressindicator.LinearProgressIndicator
-import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import java.math.BigDecimal
 import java.time.LocalDate
@@ -232,57 +235,58 @@ class QuestionnaireUiEspressoTest {
     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"))
+    composeTestRule.onNodeWithTag(DATE_TEXT_INPUT_FIELD).performTextReplacement("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() }
+    composeTestRule
+      .onNodeWithTag(DATE_TEXT_INPUT_FIELD)
+      .assert(
+        SemanticsMatcher.expectValue(
+          SemanticsProperties.Error,
+          "Date format needs to be mm/dd/yyyy (e.g. 01/31/2023)",
+        ),
+      )
+    composeTestRule.onNodeWithTag(TIME_PICKER_INPUT_FIELD).assertIsNotEnabled()
   }
 
   @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)
-    }
+    composeTestRule.onNodeWithTag(DATE_TEXT_INPUT_FIELD).performTextReplacement("01052005")
 
-    onView(withId(R.id.time_input_layout)).check { view, _ -> assertThat(view.isEnabled).isTrue() }
+    composeTestRule
+      .onNodeWithTag(DATE_TEXT_INPUT_FIELD)
+      .assert(
+        SemanticsMatcher.keyNotDefined(
+          SemanticsProperties.Error,
+        ),
+      )
+    composeTestRule.onNodeWithTag(TIME_PICKER_INPUT_FIELD).assertIsEnabled()
 
-    runBlocking {
-      assertThat(getQuestionnaireResponse().item.size).isEqualTo(1)
-      assertThat(getQuestionnaireResponse().item.first().answer.size).isEqualTo(0)
-    }
+    val questionnaireResponse = runBlocking { getQuestionnaireResponse() }
+    assertThat(questionnaireResponse.item.size).isEqualTo(1)
+    assertThat(questionnaireResponse.item.first().answer.size).isEqualTo(1)
+    val answer = questionnaireResponse.item.first().answer.first().valueDateTimeType
+    assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 0, 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"))
+    composeTestRule.onNodeWithTag(DATE_TEXT_INPUT_FIELD).performTextReplacement("01052005")
 
+    composeTestRule.onNodeWithTag(TIME_PICKER_INPUT_FIELD).printToLog("Timer!")
     onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
     clickOnText("AM")
     clickOnText("6")
     clickOnText("10")
     clickOnText("OK")
 
-    runBlocking {
-      val answer = getQuestionnaireResponse().item.first().answer.first().valueDateTimeType
-      // check Locale
-      assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 6, 10))
-    }
+    val questionnaireResponse = runBlocking { getQuestionnaireResponse() }
+    val answer = questionnaireResponse.item.first().answer.first().valueDateTimeType
+    // check Locale
+    assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 6, 10))
   }
 
   @Test

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/DateTimePickerViewHolderFactoryEspressoTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package com.google.android.fhir.datacapture.test.views
 
-import android.view.View
 import android.widget.FrameLayout
+import androidx.compose.ui.test.junit4.createEmptyComposeRule
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -51,14 +51,17 @@ class DateTimePickerViewHolderFactoryEspressoTest {
   var activityScenarioRule: ActivityScenarioRule<TestActivity> =
     ActivityScenarioRule(TestActivity::class.java)
 
-  private lateinit var parent: FrameLayout
+  @get:Rule val composeTestRule = createEmptyComposeRule()
+
   private lateinit var viewHolder: QuestionnaireItemViewHolder
 
   @Before
   fun setup() {
-    activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = DateTimePickerViewHolderFactory.create(parent)
-    setTestLayout(viewHolder.itemView)
+    activityScenarioRule.scenario.onActivity { activity ->
+      viewHolder = DateTimePickerViewHolderFactory.create(FrameLayout(activity))
+      activity.setContentView(viewHolder.itemView)
+    }
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
   }
 
   @Test
@@ -71,7 +74,7 @@ class DateTimePickerViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
     onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
     onView(allOf(withText("OK")))
       .inRoot(isDialog())
@@ -94,7 +97,7 @@ class DateTimePickerViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
     onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
     onView(allOf(withText("OK")))
       .inRoot(isDialog())
@@ -106,15 +109,4 @@ class DateTimePickerViewHolderFactoryEspressoTest {
       .inRoot(isDialog())
       .check(matches(isDisplayed()))
   }
-
-  /** Method to run code snippet on UI/main thread */
-  private fun runOnUI(action: () -> Unit) {
-    activityScenarioRule.scenario.onActivity { activity -> action() }
-  }
-
-  /** Method to set content view for test activity */
-  private fun setTestLayout(view: View) {
-    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-  }
 }