Merged HEAD (5.2) to 5.2.N (5.2.1)

127609 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127435 jvonka: Node Associations - creating/listing primary child assoc type other than cm:contains
      - follow-on to add api sanity tests
      RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:41 +00:00
parent e993c83945
commit 6fccac5a48
3 changed files with 86 additions and 4 deletions

View File

@@ -94,10 +94,6 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
private static final String URL_SECONDARY_CHILDREN = "secondary-children";
private static final String URL_PARENTS = "parents";
private static final String ASSOC_TYPE_CM_CONTAINS = "cm:contains";
private static final String ASPECT_CM_PREFERENCES = "cm:preferences";
private static final String ASSOC_TYPE_CM_PREFERENCE_IMAGE = "cm:preferenceImage";
private String user1;