Skip to content

Migrate BooleanChoiceViewHolderFactory, RadioGroupViewHolderFactory, CheckBoxGroupViewHolderFactory to compose #2905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LZRS wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Migrate BooleanChoiceViewHolderFactory, RadioGroupViewHolderFactory, CheckBoxGroupViewHolderFactory to compose #2905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b832190
Migrate BooleanChoiceViewHolderFactory to compose
LZRS Nov 3, 2025
dbfc247
Migrate RadioGroupViewHolderFactory to compose
LZRS Nov 7, 2025
db653e5
Migrate CheckBoxGroupViewHolderFactory to compose
LZRS Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions .../androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithContentDescription
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.fragment.app.commitNow
import androidx.test.espresso.Espresso.onView
Expand All @@ -49,6 +50,8 @@ import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValid
import com.google.android.fhir.datacapture.validation.Valid
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.factories.NO_CHOICE_RADIO_BUTTON_TAG
import com.google.android.fhir.datacapture.views.factories.YES_CHOICE_RADIO_BUTTON_TAG
import com.google.android.fhir.datacapture.views.factories.localDate
import com.google.android.fhir.datacapture.views.factories.localDateTime
import com.google.android.material.progressindicator.LinearProgressIndicator
Expand Down Expand Up @@ -92,20 +95,28 @@ class QuestionnaireUiEspressoTest {
fun shouldDisplayReviewButtonWhenNoMorePagesToDisplay() {
buildFragmentFromQuestionnaire("/paginated_questionnaire_with_dependent_answer.json", true)

// synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.review_mode_button))
.check(
ViewAssertions.matches(
ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
),
)

clickOnText("Yes")
composeTestRule.onNodeWithText("Yes").performClick()

// synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.review_mode_button))
.check(
ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE)),
)

clickOnText("No")
composeTestRule.onNodeWithText("No").performClick()

// synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.review_mode_button))
.check(
ViewAssertions.matches(
Expand Down Expand Up @@ -494,38 +505,37 @@ class QuestionnaireUiEspressoTest {
fun displayItems_shouldGetEnabled_withAnswerChoice() {
buildFragmentFromQuestionnaire("/questionnaire_with_enabled_display_items.json")

onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check { view, _ ->
val hintVisibility = (view as TextView).visibility
assertThat(hintVisibility).isEqualTo(View.GONE)
}
// Synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check(doesNotExist())

onView(withId(com.google.android.fhir.datacapture.R.id.yes_radio_button))
.perform(ViewActions.click())
composeTestRule.onNodeWithTag(YES_CHOICE_RADIO_BUTTON_TAG).performClick()

// Synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check { view, _ ->
val hintVisibility = (view as TextView).visibility
val hintText = view.text.toString()
assertThat(hintVisibility).isEqualTo(View.VISIBLE)
assertThat(hintText).isEqualTo("Text when yes is selected")
}

onView(withId(com.google.android.fhir.datacapture.R.id.no_radio_button))
.perform(ViewActions.click())
composeTestRule.onNodeWithTag(NO_CHOICE_RADIO_BUTTON_TAG).performClick()

// Synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check { view, _ ->
val hintVisibility = (view as TextView).visibility
val hintText = view.text.toString()
assertThat(hintVisibility).isEqualTo(View.VISIBLE)
assertThat(hintText).isEqualTo("Text when no is selected")
}

onView(withId(com.google.android.fhir.datacapture.R.id.no_radio_button))
.perform(ViewActions.click())
composeTestRule.onNodeWithTag(NO_CHOICE_RADIO_BUTTON_TAG).performClick()

onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check { view, _ ->
val hintVisibility = (view as TextView).visibility
assertThat(hintVisibility).isEqualTo(View.GONE)
}
// Synchronize
composeTestRule.waitForIdle()
onView(withId(com.google.android.fhir.datacapture.R.id.hint)).check(doesNotExist())
}

@Test
Expand All @@ -540,7 +550,7 @@ class QuestionnaireUiEspressoTest {
assertThat(view).isNull()
}

onView(CoreMatchers.allOf(withText("First Option"))).perform(ViewActions.click())
composeTestRule.onNodeWithText("First Option").performClick()

onView(CoreMatchers.allOf(withText("Option Date"))).check { view, _ ->
assertThat(view).isNull()
Expand Down
Loading
Loading