Merge pull request #2388 from IBM/add-test-for-provider

Add Tests for Configuration

Author: lmsurpre

operation/fhir-operation-bulkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/impl/AbstractSystemConfigurationImpl.java

@@ -342,7 +342,7 @@ public String getOperationOutcomeProvider(String provider) {
 
         // now we check the system level
         if (outcomeProvider == null) {
-            outcomeProvider = FHIRConfigHelper.getStringProperty("fhirServer/bulkdata/core/defaultOutcomeProvider", "default");
+            outcomeProvider = FHIRConfigHelper.getStringProperty("fhirServer/bulkdata/core/defaultOutcomeProvider", provider);
         }
 
         return outcomeProvider;

operation/fhir-operation-bulkdata/src/test/java/com/ibm/fhir/operation/bulkdata/ConfigurationTest.java

@@ -0,0 +1,70 @@
+/*
+ * (C) Copyright IBM Corp. 2021
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ibm.fhir.operation.bulkdata;
+
+import static org.testng.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.ibm.fhir.config.FHIRConfiguration;
+import com.ibm.fhir.config.FHIRRequestContext;
+import com.ibm.fhir.exception.FHIRException;
+import com.ibm.fhir.exception.FHIROperationException;
+import com.ibm.fhir.operation.bulkdata.config.ConfigurationFactory;
+
+public class ConfigurationTest {
+    // Flip to TRUE to see which tenant is running during a test (or peek at the end of the test that failed).
+    // if not specified, then it's the default.
+    private static final Boolean DEBUG = Boolean.FALSE;
+
+    @BeforeClass
+    public void setup() {
+        FHIRConfiguration.setConfigHome("src/test/resources");
+    }
+
+    @BeforeMethod
+    public void startMethod(Method method) throws FHIRException {
+        // Configure the request context for our search tests
+        FHIRRequestContext context = FHIRRequestContext.get();
+        if (context == null) {
+            context = new FHIRRequestContext();
+        }
+        FHIRRequestContext.set(context);
+
+        //Facilitate the switching of tenant configurations based on method name
+        String tenant = "default";
+        String methodName = method.getName();
+        if (methodName.contains("_tenant_")) {
+            int idx = methodName.indexOf("_tenant_") + "_tenant_".length();
+            tenant = methodName.substring(idx);
+            if (DEBUG) {
+                System.out.println("Testing with Tenant: " + tenant);
+            }
+        }
+        context.setTenantId(tenant);
+
+        context.setOriginalRequestUri("https://localhost:9443/fhir-server/api/v4");
+    }
+
+    @AfterMethod
+    public void clearThreadLocal() {
+        FHIRRequestContext.remove();
+    }
+
+    @Test
+    public void testOutcomeProvider_tenant_provider() throws FHIROperationException {
+        assertEquals(ConfigurationFactory.getInstance().getDefaultImportProvider(), "in");
+        assertEquals(ConfigurationFactory.getInstance().getDefaultExportProvider(), "out");
+        assertEquals(ConfigurationFactory.getInstance().getOperationOutcomeProvider("out"), "out");
+        assertEquals(ConfigurationFactory.getInstance().getOperationOutcomeProvider("in"), "in");
+    }
+}

operation/fhir-operation-bulkdata/src/test/resources/config/provider/fhir-server-config.json

@@ -0,0 +1,54 @@
+{
+	"__comment": "FHIR Server - Bulk Data - Test Configuration",
+	"fhirServer": {
+		"bulkdata": {
+			"enabled": true,
+			"core": {
+				"api": {
+					"url": "https://localhost:9443/ibm/api/batch",
+					"user": "fhiradmin",
+					"password": "change-password",
+					"truststore": "resources/security/fhirTrustStore.p12",
+					"truststorePassword": "change-password",
+					"trustAll": true
+				},
+				"cos": {
+					"partUploadTriggerSizeMB": 10,
+					"objectSizeThresholdMB": 200,
+					"objectResourceCountThreshold": 200000,
+					"useServerTruststore": true,
+					"presignedExpiry": 86400
+				},
+				"file": {
+					"writeTriggerSizeMB": 1,
+					"sizeThresholdMB": 200,
+					"resourceCountThreshold": 200000
+				},
+				"pageSize": 100,
+				"batchIdEncryptionKey": "change-password",
+				"maxPartitions": 3,
+				"maxInputs": 5,
+				"maxChunkReadTime": "90000",
+				"systemExportImpl": "fast",
+				"defaultImportProvider": "in",
+				"defaultExportProvider": "out"
+			},
+			"storageProviders": {
+				"in": {
+					"type": "file",
+					"fileBase": "/tmp/fhir-server/in",
+					"duplicationCheck": false,
+					"validateResources": false,
+					"create": false
+				},
+				"out": {
+					"type": "file",
+					"fileBase": "/tmp/fhir-server/out",
+					"enableParquet": false,
+					"create": false,
+					"presigned": true
+				}
+			}
+		}
+	}
+}