diff --git a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisAssertion.java b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisAssertion.java index a3cb6c7adc..df612d6891 100644 --- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisAssertion.java +++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisAssertion.java @@ -37,6 +37,7 @@ import org.apache.chemistry.opencmis.commons.data.Ace; import org.apache.chemistry.opencmis.commons.data.Acl; import org.apache.chemistry.opencmis.commons.data.CmisExtensionElement; import org.apache.chemistry.opencmis.commons.enums.Action; +import org.apache.chemistry.opencmis.commons.enums.BindingType; import org.apache.chemistry.opencmis.commons.enums.ChangeType; import org.apache.chemistry.opencmis.commons.enums.ExtensionLevel; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; @@ -314,7 +315,20 @@ public class CmisAssertion extends DSLAssertion { Document document = cmisAPI().withCMISUtil().getCmisDocument(cmisAPI().getLastResource()); STEP(String.format("%s Verify if document '%s' is private working copy", CmisWrapper.STEP_PREFIX, document.getName())); + + // Alfresco supports BindingType.WEBSERVICES for CMIS 1.0 + // (BindingType.ATOMPUB and BindingType.BROWSER for CMIS 1.1) + // and "cmis:isPrivateWorkingCopy" was introduced with CMIS 1.1. + // + // Checking if the document is a pwc through + // https://chemistry.apache.org/java/javadoc/org/apache/chemistry/opencmis/client/api/DocumentProperties.html#isPrivateWorkingCopy-- + // won't work for BindingType.WEBSERVICES + // + // Thus using + // https://chemistry.apache.org/java/javadoc/org/apache/chemistry/opencmis/client/api/Document.html#isVersionSeriesPrivateWorkingCopy-- + // which is supported in all CMIS versions. Assert.assertTrue(cmisAPI().withCMISUtil().isPrivateWorkingCopy()); + return cmisAPI(); } diff --git a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java index bbdb23f1e2..07f51113a7 100644 --- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java +++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java @@ -280,10 +280,10 @@ public class CmisUtil protected boolean isPrivateWorkingCopy() { - boolean result = false; + boolean result; try { - result = getPWCDocument().isPrivateWorkingCopy(); + result = getPWCDocument().isVersionSeriesPrivateWorkingCopy(); } catch (CmisVersioningException cmisVersioningException) {