SortTest and BulkTest should execute even if ScimServiceProviderConfi…

…g does not exist Fix for wso2-incubator#10
gclayburg · Mar 6, 2018 · 584dfda · 584dfda
1 parent 17e21da
commit 584dfda
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/info/wso2/scim2/compliance/protocol/Compliance.java b/src/main/java/info/wso2/scim2/compliance/protocol/Compliance.java
@@ -20,6 +20,7 @@
 import info.wso2.scim2.compliance.entities.TestResult;
 import info.wso2.scim2.compliance.exception.ComplianceException;
 import info.wso2.scim2.compliance.exception.CriticalComplianceException;
+import info.wso2.scim2.compliance.objects.SCIMServiceProviderConfig;
 import info.wso2.scim2.compliance.pdf.PDFGenerator;
 import info.wso2.scim2.compliance.tests.*;
 import info.wso2.scim2.compliance.tests.BulkTest;
@@ -218,8 +219,9 @@ public Result runTests(@FormParam(ComplianceConstants.RequestCodeConstants.URL)
         // Sort Test
         SortTest sortTest = new SortTest(complianceTestMetaDataHolder);
         ArrayList<TestResult> sortTestResults = new ArrayList<>();
+        SCIMServiceProviderConfig scimServiceProviderConfig = complianceTestMetaDataHolder.getScimServiceProviderConfig();
         try {
-            if (complianceTestMetaDataHolder.getScimServiceProviderConfig().getSortSupported()){
+            if (scimServiceProviderConfig != null && scimServiceProviderConfig.getSortSupported()){
                 try {
                     sortTestResults = sortTest.performTest();
                 } catch (ComplianceException e) {
@@ -239,7 +241,7 @@ public Result runTests(@FormParam(ComplianceConstants.RequestCodeConstants.URL)
         BulkTest bulkTest = new BulkTest(complianceTestMetaDataHolder);
         ArrayList<TestResult> bulkTestResults = new ArrayList<>();
         try {
-            if (complianceTestMetaDataHolder.getScimServiceProviderConfig().getBulkSupported()){
+            if (scimServiceProviderConfig != null && scimServiceProviderConfig.getBulkSupported()){
                 try {
                     bulkTestResults = bulkTest.performTest();
                 } catch (ComplianceException e) {