fix ui test

dhis2 · Jul 5, 2024 · 7d9943d · 7d9943d
1 parent 8edcbb3
commit 7d9943d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
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
 
 
@@ -95,7 +95,7 @@ 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")
     }
@@ -117,7 +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"
     }
 }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt b/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt
@@ -57,13 +57,13 @@ class ProgramEventTest : BaseTest() {
         }
         composeTestRule.waitForIdle()
         programEventsRobot(composeTestRule) {
-            checkEventWasCreatedAndClosed("1/1/2001")
+            checkEventWasCreatedAndClosed()
         }
     }
 
     @Test
     fun shouldOpenExistingEvent() {
-        val eventDate = "15/3/2020"
+        val eventDate = "15/03/2020"
         val eventOrgUnit = "Ngelehun CHC"
 
         prepareProgramAndLaunchActivity(antenatalCare)
@@ -81,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)
 
@@ -107,7 +107,7 @@ class ProgramEventTest : BaseTest() {
 
     @Test
     fun shouldDeleteEvent() {
-        val eventDate = "15/3/2020"
+        val eventDate = "15/03/2020"
 
         prepareProgramAndLaunchActivity(antenatalCare)
 

diff --git a/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt
@@ -7,9 +7,7 @@ import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeContentTestRule
 import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.printToLog
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -44,7 +42,7 @@ class ProgramEventsRobot(val composeTestRule: ComposeContentTestRule) : BaseRobo
     }
 
     @OptIn(ExperimentalTestApi::class)
-    fun checkEventWasCreatedAndClosed(eventDate: String) {
+    fun checkEventWasCreatedAndClosed() {
         composeTestRule.waitUntilAtLeastOneExists(hasTestTag("EVENT_ITEM"))
         composeTestRule.onNode(
             hasTestTag("EVENT_ITEM")

diff --git a/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt b/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt
@@ -435,7 +435,7 @@ class SearchTETest : BaseTest() {
     private fun createDisplayListFields() = DisplayListFieldsUIModel(
         "Sarah",
         "Thompson",
-        "2001-01-01",
+        "01/01/2001",
         "[email protected]",
         "Main street 1",
         "56",