revinclude integration tests

dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/integration/EndpointIntegrationTest.java

@@ -0,0 +1,71 @@
+package org.highmed.dsf.fhir.integration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
+import org.hl7.fhir.r4.model.Bundle.SearchEntryMode;
+import org.hl7.fhir.r4.model.Endpoint;
+import org.hl7.fhir.r4.model.Organization;
+import org.junit.Test;
+
+public class EndpointIntegrationTest extends AbstractIntegrationTest
+{
+	@Test
+	public void testSearchAll() throws Exception
+	{
+		Bundle searchBundle = getWebserviceClient().search(Endpoint.class, Collections.emptyMap());
+		assertNotNull(searchBundle);
+		assertEquals(1, searchBundle.getTotal());
+		assertTrue(searchBundle.getEntryFirstRep().getResource() instanceof Endpoint);
+	}
+
+	@Test
+	public void testSearchEndpointIncludeOrganization() throws Exception
+	{
+		Bundle searchBundle = getWebserviceClient().search(Endpoint.class,
+				Map.of("_include", Collections.singletonList("Endpoint:organization")));
+		assertNotNull(searchBundle);
+		assertEquals(1, searchBundle.getTotal());
+		assertEquals(2, searchBundle.getEntry().size());
+
+		BundleEntryComponent eptEntry = searchBundle.getEntry().get(0);
+		assertNotNull(eptEntry);
+		assertEquals(SearchEntryMode.MATCH, eptEntry.getSearch().getMode());
+		assertNotNull(eptEntry.getResource());
+		assertTrue(eptEntry.getResource() instanceof Endpoint);
+
+		BundleEntryComponent orgEntry = searchBundle.getEntry().get(1);
+		assertNotNull(orgEntry);
+		assertEquals(SearchEntryMode.INCLUDE, orgEntry.getSearch().getMode());
+		assertNotNull(orgEntry.getResource());
+		assertTrue(orgEntry.getResource() instanceof Organization);
+	}
+
+	@Test
+	public void testSearchEndpointRevIncludeOrganization() throws Exception
+	{
+		Bundle searchBundle = getWebserviceClient().search(Endpoint.class,
+				Map.of("_revinclude", Collections.singletonList("Organization:endpoint")));
+		assertNotNull(searchBundle);
+		assertEquals(1, searchBundle.getTotal());
+		assertEquals(2, searchBundle.getEntry().size());
+
+		BundleEntryComponent orgEntry = searchBundle.getEntry().get(0);
+		assertNotNull(orgEntry);
+		assertEquals(SearchEntryMode.MATCH, orgEntry.getSearch().getMode());
+		assertNotNull(orgEntry.getResource());
+		assertTrue(orgEntry.getResource() instanceof Endpoint);
+
+		BundleEntryComponent eptEntry = searchBundle.getEntry().get(1);
+		assertNotNull(eptEntry);
+		assertEquals(SearchEntryMode.INCLUDE, eptEntry.getSearch().getMode());
+		assertNotNull(eptEntry.getResource());
+		assertTrue(eptEntry.getResource() instanceof Organization);
+	}
+}

dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/integration/OrganizationIntegrationTest.java

@@ -22,6 +22,7 @@ public void testSearchAll() throws Exception
 		Bundle searchBundle = getWebserviceClient().search(Organization.class, Collections.emptyMap());
 		assertNotNull(searchBundle);
 		assertEquals(1, searchBundle.getTotal());
+		assertTrue(searchBundle.getEntryFirstRep().getResource() instanceof Organization);
 	}
 
 	@Test
@@ -45,4 +46,26 @@ public void testSearchOrganizationIncludeEndpoint() throws Exception
 		assertNotNull(eptEntry.getResource());
 		assertTrue(eptEntry.getResource() instanceof Endpoint);
 	}
+
+	@Test
+	public void testSearchOrganizationRevIncludeEndpoint() throws Exception
+	{
+		Bundle searchBundle = getWebserviceClient().search(Organization.class,
+				Map.of("_revinclude", Collections.singletonList("Endpoint:organization")));
+		assertNotNull(searchBundle);
+		assertEquals(1, searchBundle.getTotal());
+		assertEquals(2, searchBundle.getEntry().size());
+
+		BundleEntryComponent orgEntry = searchBundle.getEntry().get(0);
+		assertNotNull(orgEntry);
+		assertEquals(SearchEntryMode.MATCH, orgEntry.getSearch().getMode());
+		assertNotNull(orgEntry.getResource());
+		assertTrue(orgEntry.getResource() instanceof Organization);
+
+		BundleEntryComponent eptEntry = searchBundle.getEntry().get(1);
+		assertNotNull(eptEntry);
+		assertEquals(SearchEntryMode.INCLUDE, eptEntry.getSearch().getMode());
+		assertNotNull(eptEntry.getResource());
+		assertTrue(eptEntry.getResource() instanceof Endpoint);
+	}
 }

dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/test/TestSuiteIntegrationTests.java

@@ -1,6 +1,7 @@
 package org.highmed.dsf.fhir.test;
 
 import org.highmed.dsf.fhir.integration.BinaryIntegrationTest;
+import org.highmed.dsf.fhir.integration.EndpointIntegrationTest;
 import org.highmed.dsf.fhir.integration.OrganizationIntegrationTest;
 import org.highmed.dsf.fhir.integration.TaskIntegrationTest;
 import org.junit.ClassRule;
@@ -9,7 +10,8 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ BinaryIntegrationTest.class, OrganizationIntegrationTest.class, TaskIntegrationTest.class })
+@SuiteClasses({ BinaryIntegrationTest.class, EndpointIntegrationTest.class, OrganizationIntegrationTest.class,
+		TaskIntegrationTest.class })
 public class TestSuiteIntegrationTests
 {
 	@ClassRule