Fix test cases

sagarwal · sagarwal · commit 41ebbfe74534 · 2025-11-27T15:21:45.000+05:30
diff --git a/app/src/androidTest/java/org/simple/clinic/patient/PatientRepositoryAndroidTest.kt b/app/src/androidTest/java/org/simple/clinic/patient/PatientRepositoryAndroidTest.kt
@@ -922,6 +922,8 @@ class PatientRepositoryAndroidTest {
       patientRecordedAt = this.recordedAt,
       updatedAt = recordedAt,
       eligibleForReassignment = eligibleForReassignment,
+      diagnosedWithDiabetes = Yes,
+      diagnosedWithHypertension = Yes
   )
 
   private fun verifyRecentPatientOrder(
@@ -977,6 +979,8 @@ class PatientRepositoryAndroidTest {
           patientRecordedAt = this.recordedAt,
           updatedAt = updatedAt,
           eligibleForReassignment = eligibleForReassignment,
+          diagnosedWithDiabetes = Yes,
+          diagnosedWithHypertension = Yes
       )
     }
   }
@@ -1119,6 +1123,8 @@ class PatientRepositoryAndroidTest {
           patientRecordedAt = this.recordedAt,
           updatedAt = createdAt,
           eligibleForReassignment = eligibleForReassignment,
+          diagnosedWithDiabetes = Yes,
+          diagnosedWithHypertension = Yes
       )
     }
   }
diff --git a/app/src/main/java/org/simple/clinic/recentpatient/RecentPatientItem.kt b/app/src/main/java/org/simple/clinic/recentpatient/RecentPatientItem.kt
@@ -33,7 +33,7 @@ data class RecentPatientItem(
         userClock: UserClock,
         dateFormatter: DateTimeFormatter
     ): RecentPatientItem {
-      val model = RecentPatientUiModel.fromDomain(
+      val model = RecentPatientUiModel.from(
           recentPatient = recentPatient,
           today = today,
           userClock = userClock,
diff --git a/app/src/main/java/org/simple/clinic/recentpatient/RecentPatientUiModel.kt b/app/src/main/java/org/simple/clinic/recentpatient/RecentPatientUiModel.kt
@@ -32,7 +32,7 @@ data class RecentPatientUiModel(
     val isSuspectedForDiabetes: Boolean = false
 ) {
   companion object {
-    fun fromDomain(
+    fun from(
         recentPatient: RecentPatient,
         today: LocalDate,
         userClock: UserClock,
diff --git a/app/src/main/java/org/simple/clinic/recentpatientsview/RecentPatientItem.kt b/app/src/main/java/org/simple/clinic/recentpatientsview/RecentPatientItem.kt
@@ -47,7 +47,7 @@ sealed class RecentPatientItemType : ItemAdapter.Item<UiEvent> {
         dateFormatter: DateTimeFormatter,
         isPatientReassignmentFeatureEnabled: Boolean,
     ): RecentPatientItem {
-      val model = RecentPatientUiModel.fromDomain(
+      val model = RecentPatientUiModel.from(
           recentPatient = recentPatient,
           today = today,
           userClock = userClock,
diff --git a/app/src/test/java/org/simple/clinic/recentpatientsview/LatestRecentPatientsLogicTest.kt b/app/src/test/java/org/simple/clinic/recentpatientsview/LatestRecentPatientsLogicTest.kt
@@ -1,31 +1,32 @@
 package org.simple.clinic.recentpatientsview
 
-import org.mockito.kotlin.clearInvocations
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyNoMoreInteractions
-import org.mockito.kotlin.whenever
 import io.reactivex.Observable
 import io.reactivex.rxkotlin.ofType
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import org.junit.After
 import org.junit.Rule
 import org.junit.Test
+import org.mockito.kotlin.clearInvocations
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
+import org.simple.clinic.TestData
 import org.simple.clinic.patient.Gender.Female
 import org.simple.clinic.patient.Gender.Male
 import org.simple.clinic.patient.Gender.Transgender
 import org.simple.clinic.patient.PatientAgeDetails
 import org.simple.clinic.patient.PatientConfig
 import org.simple.clinic.patient.PatientRepository
 import org.simple.clinic.patient.RecentPatient
+import org.simple.clinic.recentpatient.RecentPatientUiModel
+import org.simple.clinic.util.RxErrorsRule
+import org.simple.clinic.util.TestUserClock
 import org.simple.clinic.util.scheduler.TestSchedulersProvider
 import org.simple.clinic.widgets.UiEvent
 import org.simple.mobius.migration.MobiusTestFixture
-import org.simple.clinic.TestData
-import org.simple.clinic.util.RxErrorsRule
-import org.simple.clinic.util.TestUserClock
 import java.time.Instant
 import java.time.LocalDate
 import java.time.Period
@@ -105,43 +106,49 @@ class LatestRecentPatientsLogicTest {
 
     verify(ui).updateRecentPatients(listOf(
         RecentPatientItem(
-            uuid = patientUuid1,
-            name = "Ajay Kumar",
-            age = 42,
-            gender = Transgender,
-            updatedAt = Instant.parse("2020-01-01T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = true,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid1,
+                name = "Ajay Kumar",
+                age = 42,
+                gender = Transgender,
+                updatedAt = Instant.parse("2020-01-01T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = true,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         ),
         RecentPatientItem(
-            uuid = patientUuid2,
-            name = "Vijay Kumar",
-            age = 24,
-            gender = Male,
-            updatedAt = Instant.parse("2019-12-31T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = false,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid2,
+                name = "Vijay Kumar",
+                age = 24,
+                gender = Male,
+                updatedAt = Instant.parse("2019-12-31T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = false,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         ),
         RecentPatientItem(
-            uuid = patientUuid3,
-            name = "Vinaya Kumari",
-            age = 27,
-            gender = Female,
-            updatedAt = Instant.parse("2019-12-29T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = false,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid3,
+                name = "Vinaya Kumari",
+                age = 27,
+                gender = Female,
+                updatedAt = Instant.parse("2019-12-29T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = false,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         )
     ))
     verify(ui).showOrHideRecentPatients(isVisible = true)
@@ -207,43 +214,49 @@ class LatestRecentPatientsLogicTest {
 
     verify(ui).updateRecentPatients(listOf(
         RecentPatientItem(
-            uuid = patientUuid1,
-            name = "Ajay Kumar",
-            age = 42,
-            gender = Transgender,
-            updatedAt = Instant.parse("2020-01-01T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = true,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid1,
+                name = "Ajay Kumar",
+                age = 42,
+                gender = Transgender,
+                updatedAt = Instant.parse("2020-01-01T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = true,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         ),
         RecentPatientItem(
-            uuid = patientUuid2,
-            name = "Vijay Kumar",
-            age = 24,
-            gender = Male,
-            updatedAt = Instant.parse("2019-12-31T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = false,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid2,
+                name = "Vijay Kumar",
+                age = 24,
+                gender = Male,
+                updatedAt = Instant.parse("2019-12-31T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = false,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         ),
         RecentPatientItem(
-            uuid = patientUuid3,
-            name = "Vinaya Kumari",
-            age = 27,
-            gender = Female,
-            updatedAt = Instant.parse("2019-12-28T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = false,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid3,
+                name = "Vinaya Kumari",
+                age = 27,
+                gender = Female,
+                updatedAt = Instant.parse("2019-12-28T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = false,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         ),
         SeeAllItem
     ))
@@ -278,17 +291,19 @@ class LatestRecentPatientsLogicTest {
     )))
     verify(ui).updateRecentPatients(listOf(
         RecentPatientItem(
-            uuid = patientUuid,
-            name = "Anish Acharya",
-            age = 2,
-            gender = Male,
-            updatedAt = Instant.parse("2018-01-01T00:00:00Z"),
-            dateFormatter = dateFormatter,
-            clock = userClock,
-            isNewRegistration = false,
-            isEligibleForReassignment = false,
-            isSuspectedForHypertension = false,
-            isSuspectedForDiabetes = false,
+            model = RecentPatientUiModel(
+                uuid = patientUuid,
+                name = "Anish Acharya",
+                age = 2,
+                gender = Male,
+                updatedAt = Instant.parse("2018-01-01T00:00:00Z"),
+                dateFormatter = dateFormatter,
+                clock = userClock,
+                isNewRegistration = false,
+                isEligibleForReassignment = false,
+                isSuspectedForHypertension = false,
+                isSuspectedForDiabetes = false,
+            )
         )
     ))
     verify(ui).showOrHideRecentPatients(true)

Original file line number	Diff line number	Diff line change
`@@ -922,6 +922,8 @@ class PatientRepositoryAndroidTest {`
`922`	`922`	`patientRecordedAt = this.recordedAt,`
`923`	`923`	`updatedAt = recordedAt,`
`924`	`924`	`eligibleForReassignment = eligibleForReassignment,`
	`925`	`+ diagnosedWithDiabetes = Yes,`
	`926`	`+ diagnosedWithHypertension = Yes`
`925`	`927`	`)`
`926`	`928`
`927`	`929`	`private fun verifyRecentPatientOrder(`
`@@ -977,6 +979,8 @@ class PatientRepositoryAndroidTest {`
`977`	`979`	`patientRecordedAt = this.recordedAt,`
`978`	`980`	`updatedAt = updatedAt,`
`979`	`981`	`eligibleForReassignment = eligibleForReassignment,`
	`982`	`+ diagnosedWithDiabetes = Yes,`
	`983`	`+ diagnosedWithHypertension = Yes`
`980`	`984`	`)`
`981`	`985`	`}`
`982`	`986`	`}`
`@@ -1119,6 +1123,8 @@ class PatientRepositoryAndroidTest {`
`1119`	`1123`	`patientRecordedAt = this.recordedAt,`
`1120`	`1124`	`updatedAt = createdAt,`
`1121`	`1125`	`eligibleForReassignment = eligibleForReassignment,`
	`1126`	`+ diagnosedWithDiabetes = Yes,`
	`1127`	`+ diagnosedWithHypertension = Yes`
`1122`	`1128`	`)`
`1123`	`1129`	`}`
`1124`	`1130`	`}`