refactored visit test

openmrs · May 15, 2020 · f25e8af · f25e8af
1 parent 3f850f6
commit f25e8af
Showing 1 changed file with 11 additions and 30 deletions.
diff --git a/openmrs-client/src/androidTest/java/org/openmrs/mobile/test/VisitRoomDAOTest.java b/openmrs-client/src/androidTest/java/org/openmrs/mobile/test/VisitRoomDAOTest.java
@@ -54,12 +54,7 @@ public void updateVisit_ShouldUpdateVisit() {
         database.visitRoomDAO().updateVisit(updatedVisitEntity);
         database.visitRoomDAO().getVisitByID(id).
                 test()
-                .assertValue(actualVisitEntity -> Objects.equals(actualVisitEntity.getPatientKeyID(), 2L)
-                        && Objects.equals(actualVisitEntity.getStartDate(), "updatedStartDate")
-                        && Objects.equals(actualVisitEntity.getStopDate(), "updatedStopDate")
-                        && Objects.equals(actualVisitEntity.getVisitPlace(), "updatedVisitPlace")
-                        && Objects.equals(actualVisitEntity.getVisitType(), "updatedVisitType")
-                        && Objects.equals(actualVisitEntity.getUuid(), "updatedUuid"));
+                .assertValue(actualVisitEntity -> Objects.equals(renderVisitEntityString(actualVisitEntity), renderVisitEntityString(updatedVisitEntity)));
     }
 
     @Test
@@ -78,12 +73,7 @@ public void getVisitsByPatientId_ShouldGetVisit() {
                 .test()
                 .assertValue(visitEntities -> {
                     VisitEntity actualVisitEntity = visitEntities.get(0);
-                    return Objects.equals(actualVisitEntity.getPatientKeyID(), 1L)
-                            && Objects.equals(actualVisitEntity.getStartDate(), "startDate")
-                            && Objects.equals(actualVisitEntity.getStopDate(), "stopDate")
-                            && Objects.equals(actualVisitEntity.getVisitPlace(), "visitPlace")
-                            && Objects.equals(actualVisitEntity.getVisitType(), "visitType")
-                            && Objects.equals(actualVisitEntity.getUuid(), "uuid");
+                    return Objects.equals(renderVisitEntityString(actualVisitEntity), renderVisitEntityString(expectedVisitEntity));
                 });
     }
 
@@ -92,38 +82,23 @@ public void getFirstActiveVisitByPatientId_ShouldGetFirstActiveVisit() {
         database.visitRoomDAO().saveVisit(expectedVisitEntity);
         database.visitRoomDAO().getFirstActiveVisitByPatientId(expectedVisitEntity.getPatientKeyID())
                 .test()
-                .assertValue(actualVisitEntity -> Objects.equals(actualVisitEntity.getPatientKeyID(), 1L)
-                        && Objects.equals(actualVisitEntity.getStartDate(), "startDate")
-                        && Objects.equals(actualVisitEntity.getStopDate(), "stopDate")
-                        && Objects.equals(actualVisitEntity.getVisitPlace(), "visitPlace")
-                        && Objects.equals(actualVisitEntity.getVisitType(), "visitType")
-                        && Objects.equals(actualVisitEntity.getUuid(), "uuid"));
+                .assertValue(actualVisitEntity -> Objects.equals(renderVisitEntityString(actualVisitEntity), renderVisitEntityString(expectedVisitEntity)));
     }
 
     @Test
     public void saveVisit_ShouldSaveCorrectVisit() {
         Long id = database.visitRoomDAO().saveVisit(expectedVisitEntity);
         database.visitRoomDAO().getVisitByID(id)
                 .test()
-                .assertValue(actualVisitEntity -> Objects.equals(actualVisitEntity.getPatientKeyID(), 1L)
-                        && Objects.equals(actualVisitEntity.getStartDate(), "startDate")
-                        && Objects.equals(actualVisitEntity.getStopDate(), "stopDate")
-                        && Objects.equals(actualVisitEntity.getVisitPlace(), "visitPlace")
-                        && Objects.equals(actualVisitEntity.getVisitType(), "visitType")
-                        && Objects.equals(actualVisitEntity.getUuid(), "uuid"));
+                .assertValue(actualVisitEntity -> Objects.equals(renderVisitEntityString(actualVisitEntity), renderVisitEntityString(expectedVisitEntity)));
     }
 
     @Test
     public void getVisitByUuid_ShouldGetCorrectVisit() {
         database.visitRoomDAO().saveVisit(expectedVisitEntity);
         database.visitRoomDAO().getVisitByUuid("uuid")
                 .test()
-                .assertValue(actualVisitEntity -> Objects.equals(actualVisitEntity.getPatientKeyID(), 1L)
-                        && Objects.equals(actualVisitEntity.getStartDate(), "startDate")
-                        && Objects.equals(actualVisitEntity.getStopDate(), "stopDate")
-                        && Objects.equals(actualVisitEntity.getVisitPlace(), "visitPlace")
-                        && Objects.equals(actualVisitEntity.getVisitType(), "visitType")
-                        && Objects.equals(actualVisitEntity.getUuid(), "uuid"));
+                .assertValue(actualVisitEntity -> Objects.equals(renderVisitEntityString(actualVisitEntity), renderVisitEntityString(expectedVisitEntity)));
     }
 
     @Test
@@ -149,4 +124,10 @@ private VisitEntity createVisitEntity(long id, long patientID, String startDate,
         visitEntity.setUuid(uuid);
         return visitEntity;
     }
+
+    private String renderVisitEntityString(VisitEntity visitEntity) {
+        return visitEntity.getId() + visitEntity.getPatientKeyID() + visitEntity.getStartDate()
+                + visitEntity.getStopDate() + visitEntity.getVisitPlace()
+                + visitEntity.getVisitType() + visitEntity.getUuid();
+    }
 }