Merge branch 'refs/heads/release/3.0.1' into release/3.0.0.2

# Conflicts: # commons/src/main/java/org/dhis2/commons/date/DateUtils.java # commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt # form/src/main/java/org/dhis2/form/ui/provider/inputfield/DateProvider.kt # gradle/libs.versions.toml
dhis2 · Jul 11, 2024 · c6dc12d · c6dc12d
2 parents 008aeb9 + cd89434
commit c6dc12d
Show file tree

Hide file tree

Showing 125 changed files with 2,415 additions and 1,957 deletions.
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -11,6 +11,11 @@ on:
       - main
       - develop
       - release/*
+  pull_request:
+    branches:
+      - main
+      - develop
+      - release/*
 
 jobs:
   deployment_job:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
diff --git a/app/src/androidTest/java/org/dhis2/common/mockwebserver/MockWebServerRobot.kt b/app/src/androidTest/java/org/dhis2/common/mockwebserver/MockWebServerRobot.kt
@@ -20,6 +20,8 @@ class MockWebServerRobot(private val dhis2MockServer: Dhis2MockServer) {
         const val API_OLD_TRACKED_ENTITY_PATH = "/api/trackedEntityInstances/query?.*"
         const val API_OLD_TRACKED_ENTITY_RESPONSE =
             "mocks/teilist/old_tracked_entity_empty_response.json"
+        const val API_OLD_EVENTS_PATH = "/api/events?.*"
+        const val API_OLD_EVENTS_RESPONSE = "mocks/teilist/old_events_empty_response.json"
 
     }
 }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt b/app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt
@@ -24,7 +24,6 @@ import org.dhis2.commons.idlingresource.SearchIdlingResourceSingleton
 import org.dhis2.commons.prefs.Preference
 import org.dhis2.form.ui.idling.FormCountingIdlingResource
 import org.dhis2.usescases.eventsWithoutRegistration.EventIdlingResourceSingleton
-import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.ui.EventDetailIdlingResourceSingleton
 import org.dhis2.usescases.programEventDetail.eventList.EventListIdlingResourceSingleton
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TeiDataIdlingResourceSingleton
 import org.junit.After
@@ -87,7 +86,6 @@ open class BaseTest {
             SearchIdlingResourceSingleton.countingIdlingResource,
             TeiDataIdlingResourceSingleton.countingIdlingResource,
             EventIdlingResourceSingleton.countingIdlingResource,
-            EventDetailIdlingResourceSingleton.countingIdlingResource,
         )
     }
 
@@ -100,7 +98,6 @@ open class BaseTest {
                 SearchIdlingResourceSingleton.countingIdlingResource,
                 TeiDataIdlingResourceSingleton.countingIdlingResource,
                 EventIdlingResourceSingleton.countingIdlingResource,
-                EventDetailIdlingResourceSingleton.countingIdlingResource,
             )
     }
 

diff --git a/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt
@@ -40,7 +40,7 @@ class EventRegistrationRobot : BaseRobot() {
     }
 
     private fun clickOnNextQR() {
-        onView(withId(R.id.next)).perform(click())
+        waitForView(withId(R.id.next)).perform(click())
     }
 
     fun clickOnAllQR(listQR: Int) {

diff --git a/app/src/androidTest/java/org/dhis2/usescases/event/EventTest.kt b/app/src/androidTest/java/org/dhis2/usescases/event/EventTest.kt
@@ -122,7 +122,6 @@ class EventTest : BaseTest() {
         val atenatalCare = "lxAQ7Zs9VYR"
 
         prepareProgramAndLaunchActivity(atenatalCare)
-        disableRecyclerViewAnimations()
 
         programEventsRobot(composeTestRule) {
             clickOnAddEvent()
@@ -175,14 +174,4 @@ class EventTest : BaseTest() {
             putExtra(ProgramEventDetailActivity.EXTRA_PROGRAM_UID, programUid)
         }.also { eventListRule.launch(it) }
     }
-
-    private fun disableRecyclerViewAnimations() {
-        eventListRule.getScenario().onActivity {
-            it.runOnUiThread {
-                it.supportFragmentManager.findFragmentByTag("EVENT_LIST").apply {
-                    (this as EventListFragment).binding.recycler.itemAnimator = null
-                }
-            }
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt b/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt
@@ -53,6 +53,7 @@ class SearchFlowTest : BaseTest() {
             )
         val filterCounter = "1"
         val filterTotalCount = "2"
+        enableComposeForms()
         prepareWomanProgrammeIntentAndLaunchActivity(rule)
 
         teiFlowRobot(composeTestRule) {

diff --git a/app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowRobot.kt
@@ -8,10 +8,12 @@ import org.dhis2.usescases.searchte.robot.searchTeiRobot
 import org.dhis2.usescases.teidashboard.robot.enrollmentRobot
 import org.dhis2.usescases.teidashboard.robot.eventRobot
 import org.dhis2.usescases.teidashboard.robot.teiDashboardRobot
+import java.text.SimpleDateFormat
+import java.util.Calendar
 
 fun teiFlowRobot(
     composeTestRule: ComposeTestRule,
-    teiFlowRobot: TeiFlowRobot.() -> Unit
+    teiFlowRobot: TeiFlowRobot.() -> Unit,
 ) {
     TeiFlowRobot(composeTestRule).apply {
         teiFlowRobot()
@@ -21,10 +23,10 @@ fun teiFlowRobot(
 class TeiFlowRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
 
     fun registerTEI(
-        registrationModel: RegisterTEIUIModel
+        registrationModel: RegisterTEIUIModel,
     ) {
         val registrationDate = registrationModel.firstSpecificDate
-        val enrollmentDate = registrationModel.enrollmentDate
+        val incidentDate = getCurrentDate()
 
         searchTeiRobot(composeTestRule) {
             openNextSearchParameter("First name")
@@ -37,12 +39,8 @@ class TeiFlowRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
             clickOnEnroll()
         }
 
-        enrollmentRobot {
-            clickOnInputDate("Date of enrollment *")
-            selectSpecificDate(enrollmentDate.year, enrollmentDate.month, enrollmentDate.day)
-            clickOnAcceptInDatePicker()
-            clickOnInputDate("LMP Date *")
-            clickOnAcceptInDatePicker()
+        enrollmentRobot(composeTestRule) {
+            typeOnDateParameterWithLabel("LMP Date *", incidentDate)
             clickOnSaveEnrollment()
         }
     }
@@ -53,10 +51,9 @@ class TeiFlowRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
             clickOnMenuProgramEnrollments()
         }
 
-        enrollmentRobot {
+        enrollmentRobot(composeTestRule) {
             clickOnAProgramForEnrollment(composeTestRule, program)
             clickOnAcceptInDatePicker()
-            scrollToBottomProgramForm()
             clickOnSaveEnrollment()
         }
     }
@@ -67,16 +64,16 @@ class TeiFlowRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
             clickOnMenuProgramEnrollments()
         }
 
-        enrollmentRobot {
+        enrollmentRobot(composeTestRule) {
             waitToDebounce(1000)
             checkActiveAndPastEnrollmentDetails(enrollmentDetails)
         }
     }
 
     fun checkPastEventsAreClosed(
-        programPosition: Int
+        programPosition: Int,
     ) {
-        enrollmentRobot {
+        enrollmentRobot(composeTestRule) {
             clickOnEnrolledProgram(programPosition)
         }
 
@@ -99,16 +96,34 @@ class TeiFlowRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
 
     fun changeDueDate(
         cardTitle: String,
-        date: String,
     ) {
         teiDashboardRobot(composeTestRule) {
             clickOnEventGroupByStageUsingDate(cardTitle)
         }
 
         eventRobot(composeTestRule) {
-            clickOnEventReportDate()
-            selectSpecificDate(date)
+            clickOnEventDueDate()
+            selectSpecificDate(getCurrentDatePickerDate(), getPreviousDate())
             acceptUpdateEventDate()
         }
     }
+
+    private fun getCurrentDate(): String {
+        val sdf = SimpleDateFormat("ddMMYYYY")
+        val calendar = Calendar.getInstance()
+        return sdf.format(calendar.time)
+    }
+
+    private fun getPreviousDate(): String {
+        val sdf = SimpleDateFormat("MMddYYYY")
+        val calendar = Calendar.getInstance()
+        calendar.add(Calendar.DAY_OF_MONTH, -1)
+        return sdf.format(calendar.time)
+    }
+
+    private fun getCurrentDatePickerDate(): String {
+        val sdf = SimpleDateFormat("MM/dd/YYYY")
+        val calendar = Calendar.getInstance()
+        return sdf.format(calendar.time)
+    }
 }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowTest.kt b/app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowTest.kt
@@ -6,6 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import org.dhis2.common.mockwebserver.MockWebServerRobot.Companion.API_OLD_TRACKED_ENTITY_PATH
 import org.dhis2.common.mockwebserver.MockWebServerRobot.Companion.API_OLD_TRACKED_ENTITY_RESPONSE
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.usescases.BaseTest
 import org.dhis2.usescases.flow.teiFlow.entity.DateRegistrationUIModel
 import org.dhis2.usescases.flow.teiFlow.entity.EnrollmentListUIModel
@@ -16,7 +17,6 @@ import org.hisp.dhis.android.core.mockwebserver.ResponseController
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.text.SimpleDateFormat
 import java.util.Date
 
 
@@ -53,6 +53,7 @@ class TeiFlowTest : BaseTest() {
         val enrollmentListDetails = createEnrollmentList()
         val registerTeiDetails = createRegisterTEI()
 
+        enableComposeForms()
         setupCredentials()
         setDatePicker()
         prepareWomanProgrammeIntentAndLaunchActivity(ruleSearch)
@@ -70,7 +71,7 @@ class TeiFlowTest : BaseTest() {
         EnrollmentListUIModel(
             ADULT_WOMAN_PROGRAM,
             ORG_UNIT,
-            "30/6/2017",
+            currentDate,
             currentDate
         )
 
@@ -94,9 +95,9 @@ class TeiFlowTest : BaseTest() {
     )
 
     private fun getCurrentDate(): String {
-        val sdf = SimpleDateFormat(DATE_FORMAT)
+        val sdf = DateUtils.uiDateFormat()
         val dateFormat = sdf.format(Date())
-        return dateFormat.removePrefix("0")
+        return dateFormat
     }
 
     private fun prepareWomanProgrammeIntentAndLaunchActivity(ruleSearch: ActivityTestRule<SearchTEActivity>) {
@@ -116,8 +117,5 @@ class TeiFlowTest : BaseTest() {
         const val ORG_UNIT = "Ngelehun CHC"
         const val NAME = "Marta"
         const val LASTNAME = "Stuart"
-
-        const val DATE_FORMAT = "dd/M/yyyy"
-        const val DATE_PICKER_FORMAT = ", d MMMM"
     }
 }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt b/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt
@@ -55,14 +55,15 @@ class ProgramEventTest : BaseTest() {
             clickOnFormFabButton()
             clickOnCompleteButton()
         }
+        composeTestRule.waitForIdle()
         programEventsRobot(composeTestRule) {
-            checkEventWasCreatedAndClosed(eventOrgUnit)
+            checkEventWasCreatedAndClosed()
         }
     }
 
     @Test
     fun shouldOpenExistingEvent() {
-        val eventDate = "15/3/2020"
+        val eventDate = "15/03/2020"
         val eventOrgUnit = "Ngelehun CHC"
 
         prepareProgramAndLaunchActivity(antenatalCare)
@@ -80,7 +81,7 @@ class ProgramEventTest : BaseTest() {
     @Ignore("Flaky test, will be look om issue ANDROAPP-6030")
     @Test
     fun shouldCompleteAnEventAndReopenIt() {
-        val eventDate = "15/3/2020"
+        val eventDate = "15/03/2020"
 
         prepareProgramAndLaunchActivity(antenatalCare)
 
@@ -106,7 +107,7 @@ class ProgramEventTest : BaseTest() {
 
     @Test
     fun shouldDeleteEvent() {
-        val eventDate = "15/3/2020"
+        val eventDate = "15/03/2020"
 
         prepareProgramAndLaunchActivity(antenatalCare)
 
@@ -121,6 +122,7 @@ class ProgramEventTest : BaseTest() {
         programEventsRobot(composeTestRule) {
             checkEventWasDeleted(eventDate)
         }
+        composeTestRule.waitForIdle()
         rule.getScenario().onActivity {
             context.applicationContext.deleteDatabase(DB_TO_IMPORT)
         }