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 
126470 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122329 jkaabimofrad: Fixed API tests failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:35:29 +00:00
parent 0d163f797a
commit 854869c4a9
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.rest.api.tests.RepoService.TestNetwork;
import org.alfresco.rest.api.tests.RepoService.TestPerson;
import org.alfresco.rest.api.tests.RepoService.TestSite;
@@ -41,6 +42,8 @@ import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
import org.alfresco.rest.api.tests.util.RestApiUtil;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.QName;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -70,11 +73,20 @@ public class RenditionsTest extends AbstractBaseApiTest
@Before
public void setup() throws Exception
{
TestNetwork networkOne = getTestFixture().getRandomNetwork();
TestNetwork networkOne = repoService.createNetworkWithAlias("ping", true);
networkOne.create();
userOneN1 = networkOne.createUser();
AuthenticationUtil.setFullyAuthenticatedUser(userOneN1.getId());
userOneN1Site = createSite(networkOne, userOneN1, SiteVisibility.PRIVATE);
}
@After
public void tearDown() throws Exception
{
AuthenticationUtil.clearCurrentSecurityContext();
}
/**
* Tests get node renditions.
* <p>GET:</p>
@@ -83,11 +95,9 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testListNodeRenditions() throws Exception
{
AuthenticationUtil.setFullyAuthenticatedUser(userOneN1.getId());
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
String folder_Id = repoService.addToDocumentLibrary(userOneN1Site, folderName, ContentModel.TYPE_FOLDER).getId();
String folder_Id = addNode(userOneN1Site, folderName, ContentModel.TYPE_FOLDER, userOneN1.getId());
// Create multipart request
String fileName = "quick.pdf";
@@ -198,6 +208,18 @@ public class RenditionsTest extends AbstractBaseApiTest
getAll(getRenditionsUrl(UUID.randomUUID().toString()), userOneN1.getId(), paging, params, 404);
}
private String addNode(final TestSite testSite, final String name, final QName type, String user)
{
return TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return repoService.addToDocumentLibrary(testSite, name, type).getId();
}
}, user, testSite.getNetworkId());
}
private Rendition getRendition(List<Rendition> renditions, String renditionName)
{
for (Rendition rn : renditions)