refactor: [ANDROAPP-6029] remove EventDetailIdlingResourceSingleton (#…

…3639)
dhis2 · May 24, 2024 · 0db2953 · 0db2953
1 parent 2305a33
commit 0db2953
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
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/...usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailIdlingResourceSingleton.kt b/...usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailIdlingResourceSingleton.kt
diff --git a/...va/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsViewModel.kt b/...va/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsViewModel.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.launch
 import org.dhis2.commons.extensions.truncate
 import org.dhis2.commons.locationprovider.LocationProvider
 import org.dhis2.form.data.GeometryController
+import org.dhis2.usescases.eventsWithoutRegistration.EventIdlingResourceSingleton
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.domain.ConfigureEventCatCombo
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.domain.ConfigureEventCoordinates
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.domain.ConfigureEventDetails
@@ -141,7 +142,7 @@ class EventDetailsViewModel(
     }
 
     private fun setUpEventDetails() {
-        EventDetailIdlingResourceSingleton.increment()
+        EventIdlingResourceSingleton.increment()
         viewModelScope.launch {
             configureEventDetails(
                 selectedDate = eventDate.value.currentDate,
@@ -154,21 +155,21 @@ class EventDetailsViewModel(
                 .flowOn(Dispatchers.IO)
                 .collect {
                     _eventDetails.value = it
-                    EventDetailIdlingResourceSingleton.decrement()
+                    EventIdlingResourceSingleton.decrement()
                 }
         }
     }
 
     fun setUpEventReportDate(selectedDate: Date? = null) {
-        EventDetailIdlingResourceSingleton.increment()
+        EventIdlingResourceSingleton.increment()
         viewModelScope.launch {
             configureEventReportDate(selectedDate)
                 .flowOn(Dispatchers.IO)
                 .collect {
                     _eventDate.value = it
                     setUpEventDetails()
                     setUpOrgUnit(selectedDate = it.currentDate)
-                    EventDetailIdlingResourceSingleton.decrement()
+                    EventIdlingResourceSingleton.decrement()
                 }
         }
     }
@@ -195,14 +196,14 @@ class EventDetailsViewModel(
     }
 
     fun setUpCategoryCombo(categoryOption: Pair<String, String?>? = null) {
-        EventDetailIdlingResourceSingleton.increment()
+        EventIdlingResourceSingleton.increment()
         viewModelScope.launch {
             configureEventCatCombo(categoryOption)
                 .flowOn(Dispatchers.IO)
                 .collect {
                     _eventCatCombo.value = it
                     setUpEventDetails()
-                    EventDetailIdlingResourceSingleton.decrement()
+                    EventIdlingResourceSingleton.decrement()
                 }
         }
     }
@@ -213,7 +214,7 @@ class EventDetailsViewModel(
     }
 
     private fun setUpCoordinates(value: String? = "") {
-        EventDetailIdlingResourceSingleton.increment()
+        EventIdlingResourceSingleton.increment()
         viewModelScope.launch {
             configureEventCoordinates(value)
                 .flowOn(Dispatchers.IO)
@@ -233,20 +234,20 @@ class EventDetailsViewModel(
                     )
                     _eventCoordinates.value = eventCoordinates
                     setUpEventDetails()
-                    EventDetailIdlingResourceSingleton.decrement()
+                    EventIdlingResourceSingleton.decrement()
                 }
         }
     }
 
     fun setUpEventTemp(status: EventTempStatus? = null, isChecked: Boolean = true) {
-        EventDetailIdlingResourceSingleton.increment()
+        EventIdlingResourceSingleton.increment()
         if (isChecked) {
             configureEventTemp(status).apply {
                 _eventTemp.value = this
                 setUpEventDetails()
             }
         }
-        EventDetailIdlingResourceSingleton.decrement()
+        EventIdlingResourceSingleton.decrement()
     }
 
     fun getSelectableDates(eventDate: EventDate): SelectableDates {