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 
126527 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123088 jvonka: Nodes (FileFolder) API - some test cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:00:23 +00:00
parent 70dbbd521d
commit 064da30e67
3 changed files with 159 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -71,10 +71,11 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
private static final String RESOURCE_PREFIX = "publicapi/upload/";
private static final String URL_NODES = "nodes/";
private static final String URL_RENDITIONS = "/renditions";
private static final String URL_CHILDREN = "/children";
private static final String URL_CONTENT = "/content";
protected static final String URL_NODES = "nodes";
private static final String URL_RENDITIONS = "renditions";
private static final String URL_CHILDREN = "children";
private static final String URL_CONTENT = "content";
/**
@@ -264,6 +265,13 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return person.getId();
}
protected String getOrCreateUser(String username, String password)
{
PersonInfo personInfo = new PersonInfo(username, username, username, password, null, null, null, null, null, null, null);
RepoService.TestPerson person = repoService.getOrCreateUser(personInfo, username, null);
return person.getId();
}
protected TestSite createSite(final TestNetwork testNetwork, TestPerson user, final SiteVisibility siteVisibility)
{
final String siteName = "RandomSite" + System.currentTimeMillis();
@@ -422,16 +430,16 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
protected String getNodeRenditionsUrl(String nodeId)
{
return URL_NODES + nodeId + URL_RENDITIONS;
return URL_NODES + "/" + nodeId + "/" + URL_RENDITIONS;
}
protected String getNodeChildrenUrl(String nodeId)
{
return URL_NODES + nodeId + URL_CHILDREN;
return URL_NODES + "/" + nodeId + "/" + URL_CHILDREN;
}
protected String getNodeContentUrl(String nodeId)
{
return URL_NODES + nodeId + URL_CONTENT;
return URL_NODES + "/" + nodeId + "/" + URL_CONTENT;
}
}