#41: ITI-CP-743 -- do not check DocumentEntry.availabilityStatus in X…

…DS submissions
oehf · Jul 14, 2014 · 85fb179 · 85fb179
1 parent 66a76ea
commit 85fb179
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/.../org/openehealth/ipf/commons/ihe/xds/core/validate/requests/ObjectContainerValidator.java b/.../org/openehealth/ipf/commons/ihe/xds/core/validate/requests/ObjectContainerValidator.java
@@ -208,10 +208,12 @@ private void validateDocumentEntries(EbXMLObjectContainer container, ValidationP
 
             runValidations(docEntry, documentEntrySlotValidators(profile));
 
-            AvailabilityStatus status = docEntry.getStatus();
-            if (status != null) {
-                metaDataAssert(status == AvailabilityStatus.APPROVED || status == AvailabilityStatus.DEPRECATED,
-                        DOC_ENTRY_INVALID_AVAILABILITY_STATUS, status);
+            if (profile.isQuery()) {
+                AvailabilityStatus status = docEntry.getStatus();
+                if (status != null) {
+                    metaDataAssert(status == AvailabilityStatus.APPROVED || status == AvailabilityStatus.DEPRECATED,
+                            DOC_ENTRY_INVALID_AVAILABILITY_STATUS, status);
+                }
             }
 
             LocalizedString name = docEntry.getName();

diff --git a/...ehealth/ipf/commons/ihe/xds/core/validate/requests/SubmitObjectsRequestValidatorTest.java b/...ehealth/ipf/commons/ihe/xds/core/validate/requests/SubmitObjectsRequestValidatorTest.java
@@ -86,12 +86,6 @@ public void testValidateSubmissionSetHasInvalidAvailabilityStatus() {
         expectFailure(SUBMISSION_SET_INVALID_AVAILABILITY_STATUS);
     }
 
-    @Test
-    public void testValidateDocumentEntryHasInvalidAvailabilityStatus() {
-        docEntry.setAvailabilityStatus(AvailabilityStatus.SUBMITTED);
-        expectFailure(DOC_ENTRY_INVALID_AVAILABILITY_STATUS);
-    }
-
     @Test
     public void testValidateExactlyOneSubmissionSetMustExist() {
         EbXMLProvideAndRegisterDocumentSetRequest ebXML = transformer.toEbXML(request);
@@ -496,10 +490,6 @@ private void expectFailure(ValidationMessage expectedMessage) {
         expectFailure(expectedMessage, transformer.toEbXML(request));
     }
 
-    private void expectFailure(ValidationMessage expectedMessage, ValidationProfile profile) {
-        expectFailure(expectedMessage, transformer.toEbXML(request), profile);
-    }
-
     private void expectFailure(ValidationMessage expectedMessage, EbXMLSubmitObjectsRequest ebXML) {
         expectFailure(expectedMessage, ebXML, profile);
     }

diff --git a/...g/openehealth/ipf/commons/ihe/xds/core/validate/responses/QueryResponseValidatorTest.java b/...g/openehealth/ipf/commons/ihe/xds/core/validate/responses/QueryResponseValidatorTest.java
@@ -107,7 +107,13 @@ public void testMissingObjRef() {
         response.getReferences().add(new ObjectReference());        
         expectFailure(MISSING_OBJ_REF);
     }
-
+
+    @Test
+    public void testValidateDocumentEntryHasInvalidAvailabilityStatus() {
+        docEntry.setAvailabilityStatus(AvailabilityStatus.SUBMITTED);
+        expectFailure(DOC_ENTRY_INVALID_AVAILABILITY_STATUS);
+    }
+
     private void expectFailure(ValidationMessage expectedMessage) {
         expectFailure(expectedMessage, transformer.toEbXML(response));
     }