Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added more test for patientService and patientTypeService #1301

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

added more test for patientService and patientTypeService #1301

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a218619
added more test for patientService and patientTypeService
josephbate Nov 6, 2024
44e2afe
apply format
josephbate Nov 6, 2024
0df93aa
patientService test fix
josephbate Nov 6, 2024
9b44bf1
fix format
josephbate Nov 6, 2024
9d2cceb
discarded duplicated getdata test case
josephbate Nov 6, 2024
4bf47c2
format fix
josephbate Nov 6, 2024
6d53ef7
fix format
josephbate Nov 8, 2024
b55b350
Merge branch 'I-TECH-UW:develop' into ITEST-902
josephbate Nov 14, 2024
3133fe4
Merge branch 'I-TECH-UW:develop' into ITEST-902
josephbate Nov 19, 2024
9ce03f9
Merge branch 'I-TECH-UW:develop' into ITEST-902
josephbate Nov 21, 2024
503e1cc
Merge branch 'I-TECH-UW:develop' into ITEST-902
josephbate Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/org/openelisglobal/patienttype/daoimpl/PatientTypeDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ public PatientType readPatientType(String idString) {
public List<PatientType> getPatientTypes(String description) throws LIMSRuntimeException {
List<PatientType> list = new Vector<>();
try {
String sql = "from patientType l where upper(l.description) like upper(:param) order by"
+ " upper(l.description)";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also disacrd tis formating change here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont know what exactly you want me to do coz that was a chenge i made in the dao so that it can filter the patienttypes by string it cause before that it wascreating an error
do you want me to revert the changes? @mozzy11

String sql = "from PatientType l where upper(l.description) like upper(:param) order by upper(l.description)";
org.hibernate.query.Query query = entityManager.unwrap(Session.class).createQuery(sql);
query.setParameter("param", description + "%");

Expand Down
45 changes: 37 additions & 8 deletions src/test/java/org/openelisglobal/AppTestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@

import static org.mockito.Mockito.mock;

import ca.uhn.fhir.context.FhirContext;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.ArrayList;
import java.util.List;
import lombok.NonNull;
import org.apache.http.impl.client.CloseableHttpClient;
import org.openelisglobal.audittrail.dao.AuditTrailService;
import org.openelisglobal.common.services.IStatusService;
import org.openelisglobal.common.util.Versioning;
import org.openelisglobal.dataexchange.fhir.FhirConfig;
import org.openelisglobal.dataexchange.fhir.FhirUtil;
import org.openelisglobal.dataexchange.fhir.service.FhirPersistanceService;
import org.openelisglobal.dataexchange.fhir.service.FhirTransformService;
import org.openelisglobal.dataexchange.service.order.ElectronicOrderService;
import org.openelisglobal.externalconnections.service.BasicAuthenticationDataService;
import org.openelisglobal.externalconnections.service.ExternalConnectionService;
Expand All @@ -25,7 +30,6 @@
import org.openelisglobal.program.service.ImmunohistochemistrySampleService;
import org.openelisglobal.program.service.PathologySampleService;
import org.openelisglobal.program.service.ProgramSampleService;
import org.openelisglobal.provider.service.ProviderService;
import org.openelisglobal.referral.service.ReferralResultService;
import org.openelisglobal.referral.service.ReferralService;
import org.openelisglobal.referral.service.ReferralSetService;
Expand Down Expand Up @@ -77,9 +81,10 @@
"org.openelisglobal.view", "org.openelisglobal.search.service", "org.openelisglobal.sample",
"org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service",
"org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits",
"org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman",
"org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", "org.openelisglobal.provider",
"org.openelisglobal.role", }, excludeFilters = {
@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.provider.controller.*"),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.dictionary.controller.*.java"),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.config.*"),
Expand All @@ -95,6 +100,36 @@ public FhirPersistanceService fhirPesistence() {
return mock(FhirPersistanceService.class);
}

@Bean()
@Profile("test")
public FhirUtil fhirUtil() {
return mock(FhirUtil.class);
}

@Bean()
@Profile("test")
public FhirConfig fhirConfig() {
return mock(FhirConfig.class);
}

@Bean()
@Profile("test")
public CloseableHttpClient closeableHttpClient() {
return mock(CloseableHttpClient.class);
}

@Bean()
@Profile("test")
public FhirContext fhirContext() {
return mock(FhirContext.class);
}

@Bean()
@Profile("test")
public FhirTransformService fhirTransformServicehirTransformService() {
return mock(FhirTransformService.class);
}

@Bean()
@Profile("test")
public LocalizationServiceImpl localise() {
Expand Down Expand Up @@ -167,12 +202,6 @@ public TestSectionService testSectionService() {
return mock(TestSectionService.class);
}

@Bean()
@Profile("test")
public ProviderService providerService() {
return mock(ProviderService.class);
}

@Bean()
@Profile("test")
public UserRoleService userRoleService() {
Expand Down
Loading
Loading