From 8e6bb6333f3318c6f7f1aeeb5b5207b6a742c5dc Mon Sep 17 00:00:00 2001 From: James Agnew Date: Tue, 16 Dec 2014 16:27:00 -0500 Subject: [PATCH] Unit tests --- .../uhn/fhir/jpa/dao/SearchParameterMap.java | 10 +++++ .../test/CompleteResourceProviderTest.java | 39 +++++++++++++++++-- .../resources/vm/jpa_resource_provider.vm | 8 +++- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParameterMap.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParameterMap.java index 4206516cfb1..ae15d54fd6a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParameterMap.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParameterMap.java @@ -19,6 +19,8 @@ public class SearchParameterMap extends HashMap myIncludes; private SortSpec mySort; @@ -66,6 +68,10 @@ public class SearchParameterMap extends HashMap getIncludes() { if (myIncludes == null) { myIncludes = new HashSet(); @@ -77,6 +83,10 @@ public class SearchParameterMap extends HashMap theIncludes) { myIncludes = theIncludes; } diff --git a/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java b/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java index 187ae836d8d..f81fa30f886 100644 --- a/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java +++ b/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java @@ -3,7 +3,9 @@ package ca.uhn.fhir.jpa.test; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.server.Server; @@ -15,6 +17,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.dao.DaoConfig; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.provider.JpaSystemProvider; @@ -43,6 +46,7 @@ import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.rest.gclient.StringClientParam; import ca.uhn.fhir.rest.gclient.TokenClientParam; +import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; @@ -67,6 +71,8 @@ public class CompleteResourceProviderTest { private static IFhirResourceDao ourQuestionnaireDao; private static Server ourServer; private static IFhirResourceDao ourOrganizationDao; + private static OrganizationResourceProvider ourOrganizationRp; + private static DaoConfig ourDaoConfig; // private static JpaConformanceProvider ourConfProvider; @@ -97,6 +103,29 @@ public class CompleteResourceProviderTest { } } + @Test + public void testCountParam() throws Exception { + // NB this does not get used- The paging provider has its own limits built in + ourDaoConfig.setHardSearchLimit(100); + + List resources = new ArrayList<>(); + for (int i = 0; i < 300; i++) { + Organization org = new Organization(); + org.setName("testCountParam_01"); + resources.add(org); + } + ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute(); + + Bundle found = ourClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("testCountParam_01")).limitTo(10).execute(); + assertEquals(300, found.getTotalResults().getValue().intValue()); + assertEquals(10, found.getEntries().size()); + + found = ourClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("testCountParam_01")).limitTo(999).execute(); + assertEquals(300, found.getTotalResults().getValue().intValue()); + assertEquals(50, found.getEntries().size()); + + } + /** * See issue #52 */ @@ -452,6 +481,8 @@ public class CompleteResourceProviderTest { if (true) { ourAppCtx = new ClassPathXmlApplicationContext("fhir-spring-test-config.xml"); + ourDaoConfig = (DaoConfig)ourAppCtx.getBean(DaoConfig.class); + ourPatientDao = (IFhirResourceDao) ourAppCtx.getBean("myPatientDao", IFhirResourceDao.class); PatientResourceProvider patientRp = new PatientResourceProvider(); patientRp.setDao(ourPatientDao); @@ -473,8 +504,8 @@ public class CompleteResourceProviderTest { encounterRp.setDao(encounterDao); ourOrganizationDao = (IFhirResourceDao) ourAppCtx.getBean("myOrganizationDao", IFhirResourceDao.class); - OrganizationResourceProvider organizationRp = new OrganizationResourceProvider(); - organizationRp.setDao(ourOrganizationDao); + ourOrganizationRp = new OrganizationResourceProvider(); + ourOrganizationRp.setDao(ourOrganizationDao); IFhirResourceDao imagingStudyDao = (IFhirResourceDao) ourAppCtx.getBean("myImagingStudyDao", IFhirResourceDao.class); ImagingStudyResourceProvider imagingStudyRp = new ImagingStudyResourceProvider(); @@ -492,7 +523,7 @@ public class CompleteResourceProviderTest { DocumentReferenceResourceProvider documentReferenceRp = new DocumentReferenceResourceProvider(); documentReferenceRp.setDao(documentReferenceDao); - restServer.setResourceProviders(diagnosticOrderRp, documentManifestRp, documentReferenceRp, encounterRp, locationRp, patientRp, questionnaireRp, organizationRp, imagingStudyRp); + restServer.setResourceProviders(diagnosticOrderRp, documentManifestRp, documentReferenceRp, encounterRp, locationRp, patientRp, questionnaireRp, ourOrganizationRp, imagingStudyRp); restServer.getFhirContext().setNarrativeGenerator(new DefaultThymeleafNarrativeGenerator()); IFhirSystemDao systemDao = (IFhirSystemDao) ourAppCtx.getBean("mySystemDao", IFhirSystemDao.class); @@ -502,6 +533,8 @@ public class CompleteResourceProviderTest { // ourConfProvider = new JpaConformanceProvider(restServer, systemDao, // Collections.singletonList((IFhirResourceDao)patientDao)); + restServer.setPagingProvider(new FifoMemoryPagingProvider(10)); + ourServer = new Server(port); ServletContextHandler proxyHandler = new ServletContextHandler(); diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm index f0f93ee42c2..43b16d103a6 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm @@ -73,7 +73,10 @@ public class ${className}ResourceProvider extends JpaResourceProvider<${classNam Set theIncludes, @Sort - SortSpec theSort + SortSpec theSort, + + @Count + Integer theCount ) { startRequest(theServletRequest); try { @@ -86,7 +89,8 @@ public class ${className}ResourceProvider extends JpaResourceProvider<${classNam paramMap.setIncludes(theIncludes); paramMap.setSort(theSort); - + paramMap.setCount(theCount); + ca.uhn.fhir.rest.server.IBundleProvider retVal = getDao().search(paramMap); return retVal; } finally {