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

127572 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126276 jvonka: Node Associations - initial api tests (+ve & -ve) for peer assocs
      - RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/tests/client/data/Node.java

@@ -25,6 +25,8 @@
  */
 package org.alfresco.rest.api.tests.client.data;
 
+import org.alfresco.rest.api.model.Assoc;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -256,6 +258,18 @@ public class Node
         this.relativePath = relativePath;
     }
 
+    protected Assoc association;
+
+    public Assoc getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Assoc association)
+    {
+        this.association = association;
+    }
+
     public void expected(Object o)
     {
         Node other = (Node) o;