inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/MNT-18340_needs_two_updates

Browse Source 
# Conflicts:
#	src/main/java/org/alfresco/opencmis/CMISConnector.java
This commit is contained in:
Matt Ward
2017-09-22 15:43:24 +01:00
parent bb53033ce5 366a0e773e
commit f61b3c747f
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/alfresco/opencmis/CMISTest.java
View File

@@ -3362,7 +3362,19 @@ public class CMISTest
cmisService.updateProperties(repositoryId, new Holder<String>(fileInfo.getNodeRef().toString()), null, properties, null);
}
//This extra check was added due to MNT-16641.
{
PropertiesImpl properties = new PropertiesImpl();
properties.addProperty(new PropertyStringImpl(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, "P:cm:lockable"));
Set<QName> existingAspects = nodeService.getAspects(docs.get(0).getNodeRef());
cmisService.updateProperties(repositoryId,new Holder<String>(docs.get(0).getNodeRef().toString()), null, properties, null);
Set<QName> updatedAspects = nodeService.getAspects(docs.get(0).getNodeRef());
updatedAspects.removeAll(existingAspects);
assertEquals(ContentModel.ASPECT_LOCKABLE, updatedAspects.iterator().next());
}
return repositoryId;
}
}, CmisVersion.CMIS_1_1);