inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126610 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125122 jkaabimofrad: RA-884: Fixed minor code standards issues.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:31:31 +00:00
parent 31766e2d9e
commit bdee9963af
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
View File

@@ -19,32 +19,20 @@
package org.alfresco.rest.api.tests; package org.alfresco.rest.api.tests;
import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull; import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.alfresco.repo.activities.ActivityType; import org.alfresco.repo.activities.ActivityType;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.rest.AbstractSingleNetworkSiteTest; import org.alfresco.rest.AbstractSingleNetworkSiteTest;
import org.alfresco.rest.api.Activities; import org.alfresco.rest.api.Activities;
import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.nodes.NodesEntityResource; import org.alfresco.rest.api.nodes.NodesEntityResource;
import org.alfresco.rest.api.tests.client.HttpResponse; import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.client.PublicApiClient;
import org.alfresco.rest.api.tests.client.PublicApiException;
import org.alfresco.rest.api.tests.client.RequestContext; import org.alfresco.rest.api.tests.client.RequestContext;
import org.alfresco.rest.api.tests.client.data.Activity; 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.Document;
import org.alfresco.rest.api.tests.client.data.Folder; import org.alfresco.rest.api.tests.client.data.Folder;
import org.alfresco.rest.api.tests.client.data.Node; 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.activities.ActivityPoster;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.util.HashMap; import java.util.HashMap;
@@ -85,7 +73,7 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
delete(URL_NODES, u1.getId(), documentResp.getId(), 204); delete(URL_NODES, u1.getId(), documentResp.getId(), 204);
delete(URL_NODES, u1.getId(), createdFolder.getId(), 204); delete(URL_NODES, u1.getId(), createdFolder.getId(), 204);
List<Activity> activities = getMyActivites(); List<Activity> activities = getMyActivities();
assertEquals(activities.size(),6); assertEquals(activities.size(),6);
Activity act = matchActivity(activities, ActivityType.FOLDER_ADDED, u1.getId(), tSite.getSiteId(), docLibNodeRef.getId(), folder1); Activity act = matchActivity(activities, ActivityType.FOLDER_ADDED, u1.getId(), tSite.getSiteId(), docLibNodeRef.getId(), folder1);
assertNotNull(act); assertNotNull(act);
@@ -116,14 +104,14 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null); Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null);
assertNotNull(createdFolder); assertNotNull(createdFolder);
List<Activity> activities = getMyActivites(); List<Activity> activities = getMyActivities();
Node aNode = createNode(u1.getId(), createdFolder.getId(), "mynode", "cm:failedThumbnail", null); Node aNode = createNode(u1.getId(), createdFolder.getId(), "mynode", "cm:failedThumbnail", null);
assertNotNull(aNode); assertNotNull(aNode);
delete(URL_NODES, u1.getId(), aNode.getId(), 204); delete(URL_NODES, u1.getId(), aNode.getId(), 204);
List<Activity> activitiesAgain = getMyActivites(); List<Activity> activitiesAgain = getMyActivities();
assertEquals("No activites should be created for non-file activities", activities, activitiesAgain); assertEquals("No activites should be created for non-file activities", activities, activitiesAgain);
} }
@@ -133,7 +121,7 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
@Test @Test
public void testNonSite() throws Exception public void testNonSite() throws Exception
{ {
List<Activity> activities = getMyActivites(); List<Activity> activities = getMyActivities();
String folder1 = "nonSitefolder" + System.currentTimeMillis() + "_1"; String folder1 = "nonSitefolder" + System.currentTimeMillis() + "_1";
//Create a folder outside a site //Create a folder outside a site
Folder createdFolder = createFolder(u1.getId(), Nodes.PATH_MY, folder1, null); Folder createdFolder = createFolder(u1.getId(), Nodes.PATH_MY, folder1, null);
@@ -148,7 +136,7 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
dUpdate.setName("nonsite_d2.txt"); dUpdate.setName("nonsite_d2.txt");
put(URL_NODES, u1.getId(), documentResp.getId(), toJsonAsStringNonNull(dUpdate), null, 200); put(URL_NODES, u1.getId(), documentResp.getId(), toJsonAsStringNonNull(dUpdate), null, 200);
List<Activity> activitiesAgain = getMyActivites(); List<Activity> activitiesAgain = getMyActivities();
assertEquals("No activites should be created for non-site nodes", activities, activitiesAgain); assertEquals("No activites should be created for non-site nodes", activities, activitiesAgain);
} }
@@ -157,7 +145,7 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
* @return * @return
* @throws Exception * @throws Exception
*/ */
private List<Activity> getMyActivites() throws Exception private List<Activity> getMyActivities() throws Exception
{ {
repoService.generateFeed(); repoService.generateFeed();