From b2a48bde95f6cae65e48865756309317a12be766 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 12:10:11 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    126568 jkaabimofrad:
 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)       124564 gjames: RA-884:
 Added non-file activity tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rest/api/tests/ActivitiesPostingTest.java | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java b/source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
index 2eebd7cf25..9be7ca06a2 100644
--- a/source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
@@ -8,6 +8,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.rest.api.Activities;
 import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
 import org.alfresco.rest.api.tests.client.HttpResponse;
 import org.alfresco.rest.api.tests.client.PublicApiClient;
 import org.alfresco.rest.api.tests.client.PublicApiException;
@@ -16,7 +17,9 @@ import org.alfresco.rest.api.tests.client.data.Activity;
 import org.alfresco.rest.api.tests.client.data.ContentInfo;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.activities.ActivityPoster;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
@@ -120,6 +123,23 @@ public class ActivitiesPostingTest extends AbstractBaseApiTest
         assertNotNull(act);
     }
 
+    @Test
+    public void testNonFileActivities() throws Exception
+    {
+        String folder1 = "InSitefolder" + System.currentTimeMillis() + "_1";
+        Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null);
+        assertNotNull(createdFolder);
+
+        List<Activity> activities = getMyActivites();
+
+        Node aNode = createNode(u1.getId(), createdFolder.getId(), "mynode", "cm:failedThumbnail", null);
+        assertNotNull(aNode);
+
+        delete(URL_NODES, u1.getId(), aNode.getId(), 204);
+
+        List<Activity> activitiesAgain = getMyActivites();
+        assertEquals("No activites should be created for non-file activities", activities, activitiesAgain);
+    }
 
     @Test
     public void testNonSite() throws Exception
@@ -167,8 +187,6 @@ public class ActivitiesPostingTest extends AbstractBaseApiTest
         return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
     }
 
-    //TODO: Test non-site and non-file activities.
-
     private Activity matchActivity(List<Activity> list, String type, String user, String siteId, String parentId, String title)
     {
         for (Activity act:list)