Skip to content

Commit aa34e87

Browse files
BalcanBalcan
committed
fix test
Signed-off-by: Pablo <[email protected]>
1 parent 503c9c7 commit aa34e87

File tree

9 files changed

+66
-33
lines changed

9 files changed

+66
-33
lines changed

‎app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowRobot.kt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import androidx.compose.ui.test.junit4.ComposeContentTestRule
44
import androidx.compose.ui.test.junit4.ComposeTestRule
55
import org.dhis2.common.BaseRobot
66
import org.dhis2.usescases.flow.teiFlow.entity.DateRegistrationUIModel
7-
import org.dhis2.usescases.searchte.robot.searchTeiRobot
87
import org.dhis2.usescases.flow.teiFlow.entity.EnrollmentListUIModel
98
import org.dhis2.usescases.flow.teiFlow.entity.RegisterTEIUIModel
9+
import org.dhis2.usescases.searchte.robot.searchTeiRobot
1010
import org.dhis2.usescases.teidashboard.robot.enrollmentRobot
1111
import org.dhis2.usescases.teidashboard.robot.eventRobot
1212
import org.dhis2.usescases.teidashboard.robot.teiDashboardRobot
@@ -77,23 +77,31 @@ class TeiFlowRobot : BaseRobot() {
7777

7878
teiDashboardRobot {
7979
checkCompleteStateInfoBarIsDisplay(composeTestRule)
80-
checkCanNotAddEvent()
80+
checkCanNotAddEvent(composeTestRule)
8181
checkAllEventsAreClosed(totalEvents)
8282
}
8383
}
8484

85-
fun closeEnrollmentAndCheckEvents(totalEvents: Int) {
85+
fun closeEnrollmentAndCheckEvents(
86+
composeTestRule: ComposeContentTestRule,
87+
totalEvents: Int
88+
) {
8689
teiDashboardRobot {
8790
clickOnMenuMoreOptions()
8891
clickOnTimelineEvents()
8992
clickOnMenuMoreOptions()
9093
clickOnMenuComplete()
91-
checkCanNotAddEvent()
94+
checkCanNotAddEvent(composeTestRule)
9295
checkAllEventsAreClosed(totalEvents)
9396
}
9497
}
9598

96-
fun changeDueDate(date: DateRegistrationUIModel, programStage: String, orgUnit: String, composeTestRule: ComposeTestRule) {
99+
fun changeDueDate(
100+
date: DateRegistrationUIModel,
101+
programStage: String,
102+
orgUnit: String,
103+
composeTestRule: ComposeTestRule
104+
) {
97105
teiDashboardRobot {
98106
clickOnStageGroup(programStage)
99107
clickOnEventGroupByStageUsingOU(orgUnit)

‎app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class TeiFlowTest: BaseTest() {
4646

4747
teiFlowRobot {
4848
registerTEI(registerTeiDetails)
49-
closeEnrollmentAndCheckEvents(totalEventsPerEnrollment)
49+
closeEnrollmentAndCheckEvents(composeTestRule,totalEventsPerEnrollment)
5050
enrollToProgram(composeTestRule, ADULT_WOMAN_PROGRAM)
5151
checkActiveAndPastEnrollmentDetails(enrollmentListDetails)
5252
checkPastEventsAreClosed(composeTestRule, totalEventsPerEnrollment, pastProgramPosition)

‎app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.dhis2.usescases.teidashboard.robot.eventRobot
1616
import org.dhis2.usescases.teidashboard.robot.indicatorsRobot
1717
import org.dhis2.usescases.teidashboard.robot.noteRobot
1818
import org.dhis2.usescases.teidashboard.robot.teiDashboardRobot
19+
import org.junit.Ignore
1920
import org.junit.Rule
2021
import org.junit.Test
2122
import org.junit.runner.RunWith
@@ -103,7 +104,7 @@ class TeiDashboardTest : BaseTest() {
103104
clickOnMenuMoreOptions()
104105
clickOnMenuDeactivate()
105106
checkCancelledStateInfoBarIsDisplay(composeTestRule)
106-
checkCanNotAddEvent()
107+
checkCanNotAddEvent(composeTestRule)
107108
checkAllEventsAreInactive(1)
108109
}
109110
}
@@ -118,7 +119,7 @@ class TeiDashboardTest : BaseTest() {
118119
clickOnMenuMoreOptions()
119120
clickOnMenuComplete()
120121
checkCompleteStateInfoBarIsDisplay(composeTestRule)
121-
checkCanNotAddEvent()
122+
checkCanNotAddEvent(composeTestRule)
122123
checkAllEventsAreClosed(1)
123124
}
124125
}
@@ -141,8 +142,8 @@ class TeiDashboardTest : BaseTest() {
141142
teiDashboardRobot {
142143
clickOnMenuMoreOptions()
143144
clickOnTimelineEvents()
144-
clickOnFab()
145-
clickOnReferral()
145+
clickOnFab(composeTestRule)
146+
clickOnReferral(composeTestRule)
146147
clickOnFirstReferralEvent()
147148
clickOnReferralOption(
148149
composeTestRule,
@@ -160,8 +161,8 @@ class TeiDashboardTest : BaseTest() {
160161
teiDashboardRobot {
161162
clickOnMenuMoreOptions()
162163
clickOnTimelineEvents()
163-
clickOnFab()
164-
clickOnScheduleNew()
164+
clickOnFab(composeTestRule)
165+
clickOnScheduleNew(composeTestRule)
165166
clickOnFirstReferralEvent()
166167
clickOnReferralNextButton()
167168
checkEventWasCreatedWithDate(LAB_MONITORING, LAB_MONITORING_SCHEDULE_DATE)
@@ -188,6 +189,7 @@ class TeiDashboardTest : BaseTest() {
188189
}
189190
}
190191

192+
@Ignore("This is checking xml instead of compose. Update mobile library with test tags.")
191193
@Test
192194
fun shouldShowCorrectInfoWhenOpenTEI() {
193195
prepareTeiCompletedProgrammeAndLaunchActivity(rule)

‎app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/TeiDashboardRobot.kt

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.dhis2.usescases.teidashboard.robot
33
import android.content.Context
44
import android.view.View
55
import androidx.compose.ui.test.assertIsDisplayed
6+
import androidx.compose.ui.test.assertIsNotDisplayed
67
import androidx.compose.ui.test.junit4.ComposeTestRule
78
import androidx.compose.ui.test.onNodeWithTag
89
import androidx.compose.ui.test.onNodeWithText
@@ -17,7 +18,6 @@ import androidx.test.espresso.matcher.BoundedMatcher
1718
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
1819
import androidx.test.espresso.matcher.ViewMatchers.hasSibling
1920
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
20-
import androidx.test.espresso.matcher.ViewMatchers.isEnabled
2121
import androidx.test.espresso.matcher.ViewMatchers.withId
2222
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
2323
import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -36,9 +36,9 @@ import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.DashboardProg
3636
import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.EventViewHolder
3737
import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.StageViewHolder
3838
import org.dhis2.usescases.teiDashboard.ui.STATE_INFO_BAR_TEST_TAG
39+
import org.dhis2.usescases.teiDashboard.ui.TEST_ADD_EVENT_BUTTON
3940
import org.dhis2.usescases.teidashboard.entity.EnrollmentUIModel
4041
import org.dhis2.usescases.teidashboard.entity.UpperEnrollmentUIModel
41-
import org.dhis2.utils.dialFloatingActionButton.FAB_ID
4242
import org.hamcrest.CoreMatchers.allOf
4343
import org.hamcrest.CoreMatchers.anyOf
4444
import org.hamcrest.CoreMatchers.equalTo
@@ -86,13 +86,6 @@ class TeiDashboardRobot : BaseRobot() {
8686
composeTestRule.onNodeWithText("Enrollment cancelled").assertIsDisplayed()
8787
}
8888

89-
fun checkCanAddEvent() {
90-
onView(withId(FAB_ID)).check(matches(allOf(isDisplayed(), isEnabled()))).perform(click())
91-
val targetContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
92-
val addNewTag = targetContext.resources.getString(R.string.add_new)
93-
onView(withTagValue(equalTo(addNewTag))).check(matches(isDisplayed()))
94-
}
95-
9689
fun clickOnEventWithPosition(position: Int) {
9790
onView(withId(R.id.tei_recycler))
9891
.perform(actionOnItemAtPosition<DashboardProgramViewHolder>(position, click()))
@@ -135,14 +128,15 @@ class TeiDashboardRobot : BaseRobot() {
135128
)
136129
}
137130

138-
fun clickOnFab() {
139-
onView(withId(FAB_ID)).perform(click())
131+
fun clickOnFab(composeTestRule: ComposeTestRule) {
132+
composeTestRule.onNodeWithTag(TEST_ADD_EVENT_BUTTON,useUnmergedTree = true).performClick()
140133
}
141134

142-
fun clickOnReferral() {
135+
fun clickOnReferral(composeTestRule: ComposeTestRule) {
143136
val targetContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
144137
val referalTag = targetContext.resources.getString(R.string.referral)
145-
onView(withTagValue(equalTo(referalTag))).perform(click())
138+
composeTestRule.onNodeWithTag(referalTag).performClick()
139+
// onView(withTagValue(equalTo(referalTag))).perform(click())
146140
}
147141

148142
fun checkCannotAddMoreEventToastIsShown() {
@@ -230,8 +224,8 @@ class TeiDashboardRobot : BaseRobot() {
230224
}
231225

232226

233-
fun checkCanNotAddEvent() {
234-
onView(withId(FAB_ID)).check(matches(not(isDisplayed())))
227+
fun checkCanNotAddEvent(composeTestRule: ComposeTestRule) {
228+
composeTestRule.onNodeWithTag(TEST_ADD_EVENT_BUTTON, useUnmergedTree = true).assertDoesNotExist()
235229
}
236230

237231
fun clickOnShareButton() {
@@ -312,10 +306,11 @@ class TeiDashboardRobot : BaseRobot() {
312306
}
313307
})
314308
}
315-
fun clickOnScheduleNew() {
309+
310+
fun clickOnScheduleNew(composeTestRule: ComposeTestRule) {
316311
val targetContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
317312
val scheduleTag = targetContext.resources.getString(R.string.schedule_new)
318-
onView(withTagValue(equalTo(scheduleTag))).perform(click())
313+
composeTestRule.onNodeWithTag(scheduleTag, useUnmergedTree = true).performClick()
319314
}
320315

321316
fun clickOnMenuProgramEnrollments() {

‎app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,6 @@ class TeiDashboardMobileActivity :
621621
override fun updateStatus() {
622622
}
623623

624-
/*fun updatedEnrollment(): LiveData<String>? {
625-
return currentEnrollment
626-
}*/
627-
628624
override fun displayStatusError(statusCode: StatusChangeResultCode) {
629625
when (statusCode) {
630626
StatusChangeResultCode.FAILED -> displayMessage(getString(R.string.something_wrong))

‎app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataContracts.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ class TEIDataContracts {
4040

4141
fun showProgramRuleErrorMessage()
4242
fun goToEventInitial(eventCreationType: EventCreationType, programStage: ProgramStage)
43+
fun updateEnrollment(update: Boolean)
4344
}
4445
}

‎app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
114114

115115
with(dashboardViewModel) {
116116
eventUid().observe(viewLifecycleOwner, ::displayGenerateEvent)
117+
updateEnrollment.observe(viewLifecycleOwner) { update ->
118+
updateEnrollment(update)
119+
}
117120
}
118121

119122
presenter.events.observe(viewLifecycleOwner) {
@@ -405,14 +408,17 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
405408

406409
override fun openEventDetails(intent: Intent, options: ActivityOptionsCompat) =
407410
contractHandler.scheduleEvent(intent, options).observe(this.viewLifecycleOwner) {
411+
updateEnrollment(true)
408412
}
409413

410414
override fun openEventInitial(intent: Intent) =
411415
contractHandler.editEvent(intent).observe(this.viewLifecycleOwner) {
416+
updateEnrollment(true)
412417
}
413418

414419
override fun openEventCapture(intent: Intent) =
415420
contractHandler.editEvent(intent).observe(this.viewLifecycleOwner) {
421+
updateEnrollment(true)
416422
}
417423

418424
override fun goToEventInitial(
@@ -441,6 +447,7 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
441447
bundle.putInt(Constants.EVENT_SCHEDULE_INTERVAL, programStage.standardInterval() ?: 0)
442448
intent.putExtras(bundle)
443449
contractHandler.createEvent(intent).observe(this.viewLifecycleOwner) {
450+
updateEnrollment(true)
444451
}
445452
}
446453
}
@@ -469,6 +476,12 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
469476
}
470477
}
471478

479+
override fun updateEnrollment(update: Boolean) {
480+
presenter.fetchEvents(update)
481+
presenter.getEnrollment()?.let { eventAdapter?.setEnrollment(it) }
482+
dashboardViewModel.updateDashboard()
483+
}
484+
472485
companion object {
473486
const val RC_GENERATE_EVENT = 1501
474487
const val RC_EVENTS_COMPLETED = 1601

‎app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import org.dhis2.utils.analytics.CREATE_EVENT_TEI
4646
import org.dhis2.utils.analytics.FOLLOW_UP
4747
import org.dhis2.utils.analytics.TYPE_EVENT_TEI
4848
import org.hisp.dhis.android.core.D2
49+
import org.hisp.dhis.android.core.enrollment.Enrollment
4950
import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
5051
import org.hisp.dhis.android.core.event.EventStatus
5152
import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -303,6 +304,7 @@ class TEIDataPresenter(
303304
val intent = Intent(view.context, ProgramStageSelectionActivity::class.java)
304305
intent.putExtras(bundle)
305306
contractHandler.createEvent(intent).observe(view.viewLifecycleOwner()) {
307+
view.updateEnrollment(true)
306308
}
307309
}
308310

@@ -409,4 +411,14 @@ class TEIDataPresenter(
409411
val options = programUid?.let { getNewEventCreationTypeOptions(stage, it) }
410412
return options?.let { eventCreationOptionsMapper.mapToEventsByStage(it) } ?: emptyList()
411413
}
414+
415+
fun fetchEvents(updateEnrollment: Boolean) {
416+
if (updateEnrollment) {
417+
groupingProcessor.onNext(groupingProcessor.value)
418+
}
419+
}
420+
421+
fun getEnrollment(): Enrollment? {
422+
return teiDataRepository.getEnrollment().blockingGet()
423+
}
412424
}

‎app/src/main/java/org/dhis2/usescases/teiDashboard/ui/NewEventOptionsMenu.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import androidx.compose.runtime.getValue
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15+
import androidx.compose.ui.Modifier
1516
import androidx.compose.ui.graphics.Color
1617
import androidx.compose.ui.graphics.vector.ImageVector
18+
import androidx.compose.ui.platform.testTag
1719
import androidx.compose.ui.res.vectorResource
1820
import androidx.compose.ui.tooling.preview.Preview
1921
import org.dhis2.R
@@ -30,6 +32,7 @@ fun NewEventOptions(
3032

3133
Column {
3234
IconButton(
35+
modifier = Modifier.testTag(TEST_ADD_EVENT_BUTTON),
3336
style = IconButtonStyle.FILLED,
3437
icon = {
3538
Icon(
@@ -46,6 +49,7 @@ fun NewEventOptions(
4649
) {
4750
options.forEach {
4851
DropdownMenuItem(
52+
modifier = Modifier.testTag(it.name),
4953
content = { Text(it.name) },
5054
onClick = {
5155
onOptionSelected.invoke(it.type)
@@ -75,3 +79,5 @@ fun NewEventOptionsPreview() {
7579
}
7680

7781
data class EventCreationOptions(val type: EventCreationType, val name: String)
82+
83+
const val TEST_ADD_EVENT_BUTTON = "TEST_ADD_EVENT_BUTTON"

0 commit comments

Comments
 (0)