BED-17: Queries for BedPatientAssignment should account for the voided field
#90
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| package org.openmrs.module.bedmanagement; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.openmrs.Encounter; | ||
| import org.openmrs.EncounterType; | ||
| import org.openmrs.Patient; | ||
| import org.openmrs.Visit; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.module.bedmanagement.dao.BedManagementDao; | ||
| import org.openmrs.module.bedmanagement.entity.Bed; | ||
| import org.openmrs.module.bedmanagement.entity.BedPatientAssignment; | ||
| import org.openmrs.module.bedmanagement.entity.BedType; | ||
| import org.openmrs.test.BaseModuleContextSensitiveTest; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNotNull; | ||
|
|
||
| public class BedManagementDaoImplTest extends BaseModuleContextSensitiveTest { | ||
|
Member
There was a problem hiding this comment. What is the sub-module/location of the BedManagementDaoImpl class?
Contributor
Author
There was a problem hiding this comment. Thanks @wikumChamith. I now understand why the duplicate ehcache jars/configs on classpath causing the Spring fails to create the sessionFactory. I have deleted the file. |
||
|
|
||
| private BedManagementDao bedManagementDao; | ||
|
|
||
| private EncounterType defaultEncounterType; | ||
|
|
||
| @Before | ||
| public void setup() throws Exception { | ||
| executeDataSet("org/openmrs/include/standardTestDataset.xml"); | ||
|
|
||
| bedManagementDao = Context.getRegisteredComponent("bedManagementDao", BedManagementDao.class); | ||
|
|
||
| defaultEncounterType = Context.getEncounterService().getEncounterType("Scheduled"); | ||
| } | ||
|
|
||
| private Bed createBed(String bedNumber) { | ||
| BedType bedType = new BedType(); | ||
| bedType.setName("Test BedType"); | ||
|
||
| bedType.setDisplayName("TB"); | ||
| bedType.setDescription("Test Bed Type"); | ||
| bedType = bedManagementDao.saveBedType(bedType); | ||
|
|
||
| Bed bed = new Bed(); | ||
| bed.setBedNumber(bedNumber); | ||
| bed.setStatus("AVAILABLE"); | ||
| bed.setBedType(bedType); | ||
|
|
||
| return bedManagementDao.saveBed(bed); | ||
| } | ||
|
|
||
| private Visit getTestVisit(Patient patient) { | ||
| List<Visit> visits = Context.getVisitService().getVisitsByPatient(patient); | ||
|
||
| assertNotNull(visits); | ||
| assertEquals(true, !visits.isEmpty()); | ||
| return visits.get(0); | ||
| } | ||
|
|
||
| private Encounter getTestEncounter(Patient patient) { | ||
| List<Encounter> encounters = Context.getEncounterService().getEncountersByPatient(patient); | ||
|
||
| assertNotNull(encounters); | ||
| assertEquals(true, !encounters.isEmpty()); | ||
| return encounters.get(0); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldReturnBedByPatient() { | ||
| Patient patient = Context.getPatientService().getPatient(2); | ||
| Bed bed = createBed("B101"); | ||
|
|
||
| Encounter encounter = getTestEncounter(patient); | ||
|
|
||
| BedPatientAssignment assignment = new BedPatientAssignment(); | ||
| assignment.setBed(bed); | ||
| assignment.setPatient(patient); | ||
|
||
| assignment.setEncounter(encounter); | ||
| assignment.setStartDatetime(new Date()); | ||
|
|
||
| bedManagementDao.saveBedPatientAssignment(assignment); | ||
|
|
||
| Bed result = bedManagementDao.getBedByPatient(patient); | ||
|
|
||
| assertNotNull(result); | ||
| assertEquals("B101", result.getBedNumber()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldReturnBedPatientAssignmentByUuid() { | ||
| Patient patient = Context.getPatientService().getPatient(2); | ||
| Bed bed = createBed("B102"); | ||
|
|
||
| Encounter encounter = getTestEncounter(patient); | ||
|
|
||
| BedPatientAssignment assignment = new BedPatientAssignment(); | ||
| assignment.setBed(bed); | ||
| assignment.setPatient(patient); | ||
| assignment.setEncounter(encounter); | ||
|
||
| assignment.setStartDatetime(new Date()); | ||
|
|
||
| BedPatientAssignment saved = bedManagementDao.saveBedPatientAssignment(assignment); | ||
|
|
||
| BedPatientAssignment result = bedManagementDao.getBedPatientAssignmentByUuid(saved.getUuid()); | ||
|
|
||
| assertNotNull(result); | ||
| assertEquals(patient.getUuid(), result.getPatient().getUuid()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldReturnCurrentAssignmentsByBed() { | ||
| Bed bed = createBed("B103"); | ||
|
|
||
| Patient patient1 = Context.getPatientService().getPatient(2); | ||
| Patient patient2 = Context.getPatientService().getPatient(7); | ||
|
|
||
| Encounter encounter1 = getTestEncounter(patient1); | ||
| Encounter encounter2 = getTestEncounter(patient2); | ||
|
|
||
| BedPatientAssignment a1 = new BedPatientAssignment(); | ||
| a1.setBed(bed); | ||
| a1.setPatient(patient1); | ||
| a1.setEncounter(encounter1); | ||
| a1.setStartDatetime(new Date()); | ||
| bedManagementDao.saveBedPatientAssignment(a1); | ||
|
|
||
| BedPatientAssignment a2 = new BedPatientAssignment(); | ||
| a2.setBed(bed); | ||
| a2.setPatient(patient2); | ||
| a2.setEncounter(encounter2); | ||
| a2.setStartDatetime(new Date()); | ||
| bedManagementDao.saveBedPatientAssignment(a2); | ||
|
|
||
| List<BedPatientAssignment> results = bedManagementDao.getCurrentAssignmentsByBed(bed); | ||
|
|
||
| assertNotNull(results); | ||
| assertEquals(2, results.size()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldReturnLatestBedByVisit() { | ||
| Patient patient = Context.getPatientService().getPatient(2); | ||
| Visit visit = getTestVisit(patient); | ||
|
|
||
| Encounter encounter1 = new Encounter(); | ||
| encounter1.setPatient(patient); | ||
| encounter1.setVisit(visit); | ||
| encounter1.setEncounterType(defaultEncounterType); | ||
| encounter1.setEncounterDatetime(new Date(System.currentTimeMillis() - 100000L)); | ||
| encounter1 = Context.getEncounterService().saveEncounter(encounter1); | ||
|
|
||
| Encounter encounter2 = new Encounter(); | ||
| encounter2.setPatient(patient); | ||
| encounter2.setVisit(visit); | ||
| encounter2.setEncounterType(defaultEncounterType); | ||
| encounter2.setEncounterDatetime(new Date()); | ||
| encounter2 = Context.getEncounterService().saveEncounter(encounter2); | ||
|
|
||
| Bed bed1 = createBed("B104"); | ||
| Bed bed2 = createBed("B105"); | ||
|
|
||
| BedPatientAssignment assignment1 = new BedPatientAssignment(); | ||
| assignment1.setBed(bed1); | ||
| assignment1.setPatient(patient); | ||
| assignment1.setEncounter(encounter1); | ||
| assignment1.setStartDatetime(new Date(System.currentTimeMillis() - 100000L)); | ||
| assignment1.setEndDatetime(new Date(System.currentTimeMillis() - 50000L)); | ||
| bedManagementDao.saveBedPatientAssignment(assignment1); | ||
|
|
||
| BedPatientAssignment assignment2 = new BedPatientAssignment(); | ||
| assignment2.setBed(bed2); | ||
| assignment2.setPatient(patient); | ||
| assignment2.setEncounter(encounter2); | ||
| assignment2.setStartDatetime(new Date()); | ||
| bedManagementDao.saveBedPatientAssignment(assignment2); | ||
|
|
||
| Bed latest = bedManagementDao.getLatestBedByVisit(visit.getUuid()); | ||
|
|
||
| assertNotNull(latest); | ||
| assertEquals("B105", latest.getBedNumber()); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have the
getBedByPatientmethod called/not mocked, in a test?