Skip to content

Commit 64b4171

Browse files
andresmrandresmr
authored
Merge pull request #3502 from simpledotorg/ANDROAPP-5790-Cards-design-for-program-stages
Androapp 5790 cards design for program stages
2 parents 2bfc9bc + 0622720 commit 64b4171

File tree

28 files changed

+950
-448
lines changed

28 files changed

+950
-448
lines changed

‎app/src/androidTest/java/org/dhis2/usescases/event/EventTest.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,16 @@ class EventTest : BaseTest() {
4040
@get:Rule
4141
val composeTestRule = createComposeRule()
4242

43+
@Ignore
4344
@Test
4445
fun shouldDeleteEventWhenClickOnDeleteInsideSpecificEvent() {
45-
val tbVisit = "TB visit"
4646
val tbVisitDate = "31/12/2019"
4747
val tbProgramStages = createProgramStageModel()
4848

4949
prepareEventToDeleteIntentAndLaunchActivity(ruleTeiDashboard)
5050

5151
teiDashboardRobot {
52-
clickOnStageGroup(tbVisit)
53-
clickOnEventGroupByStage(tbVisitDate)
52+
clickOnEventGroupByStageUsingDate(composeTestRule, tbVisitDate)
5453
}
5554

5655
eventRegistrationRobot {
@@ -100,7 +99,7 @@ class EventTest : BaseTest() {
10099
prepareEventToUpdateIntentAndLaunchActivity(ruleTeiDashboard)
101100

102101
teiDashboardRobot {
103-
clickOnStageGroup(labMonitoring)
102+
clickOnStageGroup(composeTestRule, labMonitoring)
104103
clickOnEventGroupByStage(eventDate)
105104
}
106105

@@ -111,7 +110,7 @@ class EventTest : BaseTest() {
111110
}
112111

113112
teiDashboardRobot {
114-
clickOnStageGroup(labMonitoring)
113+
clickOnStageGroup(composeTestRule, labMonitoring)
115114
checkEventStateStageGroup(labMonitoringStatus)
116115
}
117116
}

‎app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ class SyncFlowTest : BaseTest() {
6969
}
7070

7171
teiDashboardRobot {
72-
clickOnGroupEventByName(LAB_MONITORING)
73-
clickOnEventWith(LAB_MONITORING_EVENT_DATE, ORG_UNIT)
72+
clickOnEventWith(composeTestRule, LAB_MONITORING_EVENT_DATE)
7473
}
7574

7675
eventRobot {

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ package org.dhis2.usescases.flow.teiFlow
33
import androidx.compose.ui.test.junit4.ComposeContentTestRule
44
import androidx.compose.ui.test.junit4.ComposeTestRule
55
import org.dhis2.common.BaseRobot
6-
import org.dhis2.usescases.flow.teiFlow.entity.DateRegistrationUIModel
76
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
10-
import org.dhis2.usescases.searchte.robot.searchTeiRobot
119
import org.dhis2.usescases.teidashboard.robot.enrollmentRobot
1210
import org.dhis2.usescases.teidashboard.robot.eventRobot
1311
import org.dhis2.usescases.teidashboard.robot.teiDashboardRobot
@@ -73,38 +71,34 @@ class TeiFlowRobot : BaseRobot() {
7371

7472
fun checkPastEventsAreClosed(
7573
composeTestRule: ComposeContentTestRule,
76-
totalEvents: Int,
7774
programPosition: Int
7875
) {
7976
enrollmentRobot {
8077
clickOnEnrolledProgram(programPosition)
8178
}
8279

8380
teiDashboardRobot {
84-
checkCompleteStateInfoBarIsDisplay(composeTestRule)
8581
checkCanNotAddEvent(composeTestRule)
86-
checkAllEventsAreClosed(totalEvents)
82+
checkAllEventsAreClosed(composeTestRule)
8783
}
8884
}
8985

9086
fun closeEnrollmentAndCheckEvents(
9187
composeTestRule: ComposeContentTestRule,
92-
totalEvents: Int
9388
) {
9489
teiDashboardRobot {
9590
clickOnMenuMoreOptions()
9691
clickOnTimelineEvents()
9792
clickOnMenuMoreOptions()
9893
clickOnMenuComplete()
9994
checkCanNotAddEvent(composeTestRule)
100-
checkAllEventsAreClosed(totalEvents)
95+
checkAllEventsAreClosed(composeTestRule)
10196
}
10297
}
10398

104-
fun changeDueDate(date: String, programStage: String, orgUnit: String, composeTestRule: ComposeTestRule) {
99+
fun changeDueDate(date: String, composeTestRule: ComposeTestRule) {
105100
teiDashboardRobot {
106-
clickOnStageGroup(programStage)
107-
clickOnEventGroupByStageUsingOU(orgUnit)
101+
clickOnEventGroupByStageUsingDate(composeTestRule, date)
108102
}
109103

110104
eventRobot {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class TeiFlowTest: BaseTest() {
3636
@Test
3737
fun shouldEnrollToSameProgramAfterClosedIt() {
3838
val totalEventsPerEnrollment = 3
39-
val pastProgramPosition = 4
4039
val enrollmentListDetails = createEnrollmentList()
4140
val registerTeiDetails = createRegisterTEI()
4241

@@ -46,10 +45,10 @@ class TeiFlowTest: BaseTest() {
4645

4746
teiFlowRobot {
4847
registerTEI(registerTeiDetails, composeTestRule)
49-
closeEnrollmentAndCheckEvents(composeTestRule,totalEventsPerEnrollment)
48+
closeEnrollmentAndCheckEvents(composeTestRule)
5049
enrollToProgram(composeTestRule, ADULT_WOMAN_PROGRAM)
5150
checkActiveAndPastEnrollmentDetails(enrollmentListDetails)
52-
checkPastEventsAreClosed(composeTestRule, totalEventsPerEnrollment, pastProgramPosition)
51+
checkPastEventsAreClosed(composeTestRule, totalEventsPerEnrollment)
5352
}
5453
}
5554

‎app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class SearchTETest : BaseTest() {
179179

180180
teiFlowRobot {
181181
registerTEI(registerTeiDetails, composeTestRule)
182-
changeDueDate(overdueDate, programStage, orgUnit, composeTestRule)
182+
changeDueDate(overdueDate, composeTestRule)
183183
pressBack()
184184
composeTestRule.onNodeWithTag(SECONDARY_BUTTON_TAG).performClick()
185185
pressBack()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class TeiDashboardTest : BaseTest() {
3232

3333
@get:Rule
3434
val composeTestRule = createComposeRule()
35+
3536
@Test
3637
fun shouldSuccessfullyCreateANoteWhenClickCreateNote() {
3738
setupCredentials()
@@ -105,7 +106,7 @@ class TeiDashboardTest : BaseTest() {
105106
clickOnMenuDeactivate()
106107
checkCancelledStateInfoBarIsDisplay(composeTestRule)
107108
checkCanNotAddEvent(composeTestRule)
108-
checkAllEventsAreInactive(1)
109+
checkAllEventsAreClosed(composeTestRule)
109110
}
110111
}
111112

@@ -120,7 +121,7 @@ class TeiDashboardTest : BaseTest() {
120121
clickOnMenuComplete()
121122
checkCompleteStateInfoBarIsDisplay(composeTestRule)
122123
checkCanNotAddEvent(composeTestRule)
123-
checkAllEventsAreClosed(1)
124+
checkAllEventsAreClosed(composeTestRule)
124125
}
125126
}
126127

@@ -226,16 +227,15 @@ class TeiDashboardTest : BaseTest() {
226227
}
227228
}
228229

230+
@Ignore
229231
@Test
230232
fun shouldOpenEventEditAndSaveSuccessfully() {
231233
prepareTeiOpenedToEditAndLaunchActivity(rule)
232234

233-
val labMonitoring = 2
234-
235235
teiDashboardRobot {
236236
clickOnMenuMoreOptions()
237237
clickOnTimelineEvents()
238-
clickOnEventWithPosition(labMonitoring)
238+
clickOnEventWith(composeTestRule, LAB_MONITORING)
239239
waitToDebounce(600)
240240
}
241241

@@ -248,7 +248,7 @@ class TeiDashboardTest : BaseTest() {
248248
}
249249

250250
teiDashboardRobot {
251-
checkEventWasCreatedAndClosed(LAB_MONITORING, 2)
251+
checkEventWasCreatedAndClosed(composeTestRule, LAB_MONITORING)
252252
}
253253
}
254254

0 commit comments

Comments
 (0)