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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
129174 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128594 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 2
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:39 +00:00
parent 575183a5ac
commit 472785f0bd
10 changed files with 177 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java
View File

@@ -97,13 +97,17 @@ public class RenditionsTest extends AbstractBaseApiTest
networkOne.create();
userOneN1 = networkOne.createUser();
userOneN1Site = createSite(networkOne.getId(), userOneN1.getId(), SiteVisibility.PRIVATE);
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
String siteTitle = "RandomSite" + System.currentTimeMillis();
userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
}
@After
public void tearDown() throws Exception
{
deleteSite(networkOne.getId(), userOneN1.getId(), userOneN1Site.getId(), 204);
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
deleteSite(userOneN1Site.getId(), 204);
}
/**
@@ -114,7 +118,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testListNodeRenditions() throws Exception
{
setRequestContext(userOneN1.getId());
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
@@ -765,11 +769,7 @@ public class RenditionsTest extends AbstractBaseApiTest
private String addToDocumentLibrary(Site testSite, String name, String nodeType, String userId) throws Exception
{
// TODO refactor to consistently handle user/network (with option to switch network in cloud test scenarios)
// eg. set request context (rather than explicitly passing userId/networkId) ?
String networkId = repoService.tenantService.getUserDomain(userId);
String parentId = getSiteContainerNodeId(networkId, userId, testSite.getId(), "documentLibrary");
String parentId = getSiteContainerNodeId(testSite.getId(), "documentLibrary");
return createNode(parentId, name, nodeType, null).getId();
}