Merge pull request #415 from IBM/Albert-Master-New

issue #414 enhance server integration tests to support both derby and db2

Author: albertwang-ibm

fhir-server-test/src/test/java/com/ibm/fhir/server/test/R4ExampleServerTest.java

@@ -16,21 +16,21 @@
  * Basic sniff test of the FHIR Server.
  */
 public class R4ExampleServerTest extends FHIRServerTestBase {
-    
+
     /**
      * Process all the examples in the fhir-r4-spec example library
      */
     @Test(groups = { "server-examples" })
     public void processExamples() throws Exception {
         DriverMetrics dm = new DriverMetrics();
-        
+
         // Process each of the examples using the provided ExampleRequestProcessor. We want to
         // validate first before we try and send to FHIR
         final R4ExamplesDriver driver = new R4ExamplesDriver();
         driver.setMetrics(dm);
         driver.setValidator(new ValidationProcessor());
-        driver.setProcessor(new ExampleRequestProcessor(this, null, dm, 1));
-        
+        driver.setProcessor(new ExampleRequestProcessor(this, "default", dm, 1));
+
         driver.processAllExamples();
-     }
+    }
 }

fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchExtensionsTest.java

@@ -56,15 +56,20 @@ public void testCreatePatientWithExtensions() throws Exception {
 
         Entity<Patient> entity = Entity.entity(patient, FHIRMediaType.APPLICATION_FHIR_JSON);
         Response response =
-                target.path("Patient").request().header("X-FHIR-TENANT-ID", "tenant1").post(entity, Response.class);
+                target.path("Patient").request()
+                .header("X-FHIR-TENANT-ID", "tenant1")
+                .post(entity, Response.class);
         assertResponse(response, Response.Status.CREATED.getStatusCode());
 
         // Get the patient's logical id value.
         String patientId = getLocationLogicalId(response);
 
         // Next, call the 'read' API to retrieve the new patient and verify it.
         response =
-                target.path("Patient/" + patientId).request(FHIRMediaType.APPLICATION_FHIR_JSON).get();
+                target.path("Patient/" + patientId)
+                .request(FHIRMediaType.APPLICATION_FHIR_JSON)
+                .header("X-FHIR-TENANT-ID", "tenant1")
+                .get();
         assertResponse(response, Response.Status.OK.getStatusCode());
         Patient responsePatient = response.readEntity(Patient.class);
         savedCreatedPatientWithExtensions = responsePatient;