Fix unit tests
This commit is contained in:
James Agnew
parent
98e0753b93
commit
6b9f8ec487
|
|
@ -95,12 +95,13 @@ public class ResourceReferenceInfo {
|
|||
int colonIndex = theInclude.getValue().indexOf(':');
|
||||
if (colonIndex != -1) {
|
||||
// DSTU2+ style
|
||||
String resourceName = theInclude.getValue().substring(0, colonIndex);
|
||||
String paramName = theInclude.getValue().substring(colonIndex + 1);
|
||||
RuntimeResourceDefinition resourceDef = myContext.getResourceDefinition(myOwningResource);
|
||||
RuntimeResourceDefinition resourceDef = myContext.getResourceDefinition(resourceName);
|
||||
if (resourceDef != null) {
|
||||
RuntimeSearchParam searchParamDef = resourceDef.getSearchParam(paramName);
|
||||
if (searchParamDef!=null) {
|
||||
if (searchParamDef.getPathsSplit().contains(resourceDef.getName() + "." + myName)) {
|
||||
if (searchParamDef.getPathsSplit().contains(myOwningResource + "." + myName)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,153 +28,156 @@ import ca.uhn.fhir.rest.server.BundleInclusionRule;
|
|||
import ca.uhn.fhir.util.TestUtil;
|
||||
|
||||
public class Dstu2BundleFactoryTest {
|
||||
private static FhirContext ourCtx;
|
||||
private List<IBaseResource> myResourceList;
|
||||
private Dstu2BundleFactory myBundleFactory;
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(Dstu2BundleFactoryTest.class);
|
||||
|
||||
@BeforeClass
|
||||
public static void beforeClass() throws Exception {
|
||||
ourCtx = FhirContext.forDstu2();
|
||||
}
|
||||
private static FhirContext ourCtx;
|
||||
private List<IBaseResource> myResourceList;
|
||||
private Dstu2BundleFactory myBundleFactory;
|
||||
|
||||
@AfterClass
|
||||
public static void afterClassClearContext() {
|
||||
TestUtil.clearAllStaticFieldsForUnitTest();
|
||||
}
|
||||
@BeforeClass
|
||||
public static void beforeClass() throws Exception {
|
||||
ourCtx = FhirContext.forDstu2();
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void afterClassClearContext() {
|
||||
TestUtil.clearAllStaticFieldsForUnitTest();
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
// DiagnosticReport
|
||||
// Performer(practitioner)
|
||||
// Subject(patient)
|
||||
// Result(observation)
|
||||
// Specimen(specimen1)
|
||||
// Subject(patient)
|
||||
// Collector(practitioner)
|
||||
// Subject(patient)
|
||||
// Performer(practitioner)
|
||||
// Specimen(specimen2)
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
// DiagnosticReport
|
||||
// Performer(practitioner)
|
||||
// Subject(patient)
|
||||
// Result(observation)
|
||||
// Specimen(specimen1)
|
||||
// Subject(patient)
|
||||
// Collector(practitioner)
|
||||
// Subject(patient)
|
||||
// Performer(practitioner)
|
||||
// Specimen(specimen2)
|
||||
|
||||
DiagnosticReport diagnosticReport = new DiagnosticReport();
|
||||
diagnosticReport.setId("DiagnosticReport/1");
|
||||
DiagnosticReport diagnosticReport = new DiagnosticReport();
|
||||
diagnosticReport.setId("DiagnosticReport/1");
|
||||
|
||||
Observation observation = new Observation();
|
||||
observation.setId("Observation/1");
|
||||
Observation observation = new Observation();
|
||||
observation.setId("Observation/1");
|
||||
|
||||
Specimen specimen1 = new Specimen();
|
||||
specimen1.setId("Specimen/1");
|
||||
Specimen specimen1 = new Specimen();
|
||||
specimen1.setId("Specimen/1");
|
||||
|
||||
Specimen specimen2 = new Specimen();
|
||||
specimen2.setId("Specimen/2");
|
||||
Specimen specimen2 = new Specimen();
|
||||
specimen2.setId("Specimen/2");
|
||||
|
||||
Practitioner practitioner = new Practitioner();
|
||||
practitioner.setId("Practitioner/1");
|
||||
Practitioner practitioner = new Practitioner();
|
||||
practitioner.setId("Practitioner/1");
|
||||
|
||||
Patient patient = new Patient();
|
||||
patient.setId("Patient/1");
|
||||
Patient patient = new Patient();
|
||||
patient.setId("Patient/1");
|
||||
|
||||
diagnosticReport.setPerformer(new ResourceReferenceDt(practitioner));
|
||||
diagnosticReport.setSubject(new ResourceReferenceDt(patient));
|
||||
diagnosticReport.setResult(Arrays.asList(new ResourceReferenceDt[]{new ResourceReferenceDt(observation)}));
|
||||
diagnosticReport.setSpecimen(Arrays.asList(new ResourceReferenceDt(specimen2)));
|
||||
diagnosticReport.setPerformer(new ResourceReferenceDt(practitioner));
|
||||
diagnosticReport.setSubject(new ResourceReferenceDt(patient));
|
||||
diagnosticReport.setResult(Arrays.asList(new ResourceReferenceDt[] { new ResourceReferenceDt(observation) }));
|
||||
diagnosticReport.setSpecimen(Arrays.asList(new ResourceReferenceDt(specimen2)));
|
||||
|
||||
observation.setSpecimen(new ResourceReferenceDt(specimen1));
|
||||
observation.setSubject(new ResourceReferenceDt(patient));
|
||||
observation.setPerformer(Arrays.asList(new ResourceReferenceDt[]{new ResourceReferenceDt(practitioner)}));
|
||||
observation.setSpecimen(new ResourceReferenceDt(specimen1));
|
||||
observation.setSubject(new ResourceReferenceDt(patient));
|
||||
observation.setPerformer(Arrays.asList(new ResourceReferenceDt[] { new ResourceReferenceDt(practitioner) }));
|
||||
|
||||
specimen1.setSubject(new ResourceReferenceDt(patient));
|
||||
specimen1.getCollection().setCollector(new ResourceReferenceDt(practitioner));
|
||||
specimen1.setSubject(new ResourceReferenceDt(patient));
|
||||
specimen1.getCollection().setCollector(new ResourceReferenceDt(practitioner));
|
||||
|
||||
myResourceList = Arrays.asList(new IBaseResource[]{diagnosticReport});
|
||||
myResourceList = Arrays.asList(new IBaseResource[] { diagnosticReport });
|
||||
|
||||
myBundleFactory = new Dstu2BundleFactory(ourCtx);
|
||||
}
|
||||
myBundleFactory = new Dstu2BundleFactory(ourCtx);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenIncludeIsAsterisk_bundle_shouldContainAllReferencedResources() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(new String("*")));
|
||||
@Test
|
||||
public void whenIncludeIsAsterisk_bundle_shouldContainAllReferencedResources() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(new String("*")));
|
||||
|
||||
assertEquals(6, bundle.getEntry().size());
|
||||
assertEquals(2, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
}
|
||||
assertEquals(6, bundle.getEntry().size());
|
||||
assertEquals(2, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenIncludeIsNull_bundle_shouldOnlyContainPrimaryResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, null);
|
||||
assertEquals(1, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
}
|
||||
@Test
|
||||
public void whenIncludeIsNull_bundle_shouldOnlyContainPrimaryResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, null);
|
||||
assertEquals(1, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenIncludeIsDiagnosticReportSubject_bundle_shouldIncludePatient() throws Exception {
|
||||
Set<Include> includes = includes(DiagnosticReport.INCLUDE_SUBJECT.getValue());
|
||||
@Test
|
||||
public void whenIncludeIsDiagnosticReportSubject_bundle_shouldIncludePatient() throws Exception {
|
||||
Set<Include> includes = includes(DiagnosticReport.INCLUDE_SUBJECT.getValue());
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes);
|
||||
|
||||
assertEquals(2, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Patient.class));
|
||||
}
|
||||
assertEquals(2, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Patient.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void whenAChainedResourceIsIncludedAndItsParentIsAlsoIncluded_bundle_shouldContainTheChainedResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(DiagnosticReport.INCLUDE_RESULT.getValue(), Observation.INCLUDE_SPECIMEN.getValue()));
|
||||
|
||||
@Test
|
||||
public void whenAChainedResourceIsIncludedAndItsParentIsAlsoIncluded_bundle_shouldContainTheChainedResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(DiagnosticReport.INCLUDE_RESULT.getValue(), Observation.INCLUDE_SPECIMEN.getValue()));
|
||||
ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(bundle));
|
||||
|
||||
assertEquals(3, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Observation.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
List<Specimen> specimens = getResourcesOfType(bundle, Specimen.class);
|
||||
assertEquals(1, specimens.size());
|
||||
assertEquals("1", specimens.get(0).getId().getIdPart());
|
||||
}
|
||||
|
||||
assertEquals(3, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Observation.class));
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
List<Specimen> specimens = getResourcesOfType(bundle, Specimen.class);
|
||||
assertEquals(1, specimens.size());
|
||||
assertEquals("1", specimens.get(0).getId().getIdPart());
|
||||
}
|
||||
@Test
|
||||
public void whenAChainedResourceIsIncludedButItsParentIsNot_bundle_shouldNotContainTheChainedResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(Observation.INCLUDE_SPECIMEN.getValue()));
|
||||
|
||||
@Test
|
||||
public void whenAChainedResourceIsIncludedButItsParentIsNot_bundle_shouldNotContainTheChainedResource() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_INCLUDES, includes(Observation.INCLUDE_SPECIMEN.getValue()));
|
||||
assertEquals(1, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
}
|
||||
|
||||
assertEquals(1, bundle.getEntry().size());
|
||||
assertEquals(1, numberOfEntriesOfType(bundle, DiagnosticReport.class));
|
||||
}
|
||||
@Test
|
||||
public void whenBundleInclusionRuleSetToResourcePresence_bundle_shouldContainAllResources() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_RESOURCE_PRESENCE, null);
|
||||
|
||||
@Test
|
||||
public void whenBundleInclusionRuleSetToResourcePresence_bundle_shouldContainAllResources() throws Exception {
|
||||
Bundle bundle = makeBundle(BundleInclusionRule.BASED_ON_RESOURCE_PRESENCE, null);
|
||||
assertEquals(6, bundle.getEntry().size());
|
||||
assertEquals(2, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
}
|
||||
|
||||
assertEquals(6, bundle.getEntry().size());
|
||||
assertEquals(2, numberOfEntriesOfType(bundle, Specimen.class));
|
||||
}
|
||||
Bundle makeBundle(BundleInclusionRule theBundleInclusionRule, Set<Include> theIncludes) {
|
||||
myBundleFactory.addResourcesToBundle(myResourceList, null, "http://foo", theBundleInclusionRule, theIncludes);
|
||||
return (Bundle) myBundleFactory.getResourceBundle();
|
||||
}
|
||||
|
||||
Bundle makeBundle(BundleInclusionRule theBundleInclusionRule, Set<Include> theIncludes) {
|
||||
myBundleFactory.addResourcesToBundle(myResourceList, null, "http://foo", theBundleInclusionRule, theIncludes);
|
||||
return (Bundle) myBundleFactory.getResourceBundle();
|
||||
}
|
||||
private Set<Include> includes(String... includes) {
|
||||
Set<Include> includeSet = new HashSet<Include>();
|
||||
for (String include : includes) {
|
||||
includeSet.add(new Include(include));
|
||||
}
|
||||
return includeSet;
|
||||
}
|
||||
|
||||
private Set<Include> includes(String... includes) {
|
||||
Set<Include> includeSet = new HashSet<Include>();
|
||||
for (String include : includes) {
|
||||
includeSet.add(new Include(include));
|
||||
}
|
||||
return includeSet;
|
||||
}
|
||||
private <T extends IResource> int numberOfEntriesOfType(Bundle theBundle, Class<T> theResourceClass) {
|
||||
int count = 0;
|
||||
for (Bundle.Entry entry : theBundle.getEntry()) {
|
||||
if (theResourceClass.isAssignableFrom(entry.getResource().getClass()))
|
||||
count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
private <T extends IResource> int numberOfEntriesOfType(Bundle theBundle, Class<T> theResourceClass) {
|
||||
int count = 0;
|
||||
for (Bundle.Entry entry : theBundle.getEntry()) {
|
||||
if (theResourceClass.isAssignableFrom(entry.getResource().getClass()))
|
||||
count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T extends IResource> List<T> getResourcesOfType(Bundle theBundle, Class<T> theResourceClass) {
|
||||
List<T> resources = new ArrayList<T>();
|
||||
for (Bundle.Entry entry : theBundle.getEntry()) {
|
||||
if (theResourceClass.isAssignableFrom(entry.getResource().getClass())) {
|
||||
resources.add((T) entry.getResource());
|
||||
}
|
||||
}
|
||||
return resources;
|
||||
}
|
||||
List<T> resources = new ArrayList<T>();
|
||||
for (Bundle.Entry entry : theBundle.getEntry()) {
|
||||
if (theResourceClass.isAssignableFrom(entry.getResource().getClass())) {
|
||||
resources.add((T) entry.getResource());
|
||||
}
|
||||
}
|
||||
return resources;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue