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 
126523 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123046 jvonka: Update API tests for  - tweaks for common code, also check that Last-Modified and Expires are not null when downloading file content/rendition
      RA-641, RA-676, RA-829, RA-830


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:58:55 +00:00
parent ef3ca313a1
commit 04d203e507
4 changed files with 152 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,12 @@ 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";
/**
* The api scope. either public or private
* @return public or private
@@ -394,11 +400,16 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
protected String getNodeRenditionsUrl(String nodeId)
{
return "nodes/" + nodeId + "/renditions";
return URL_NODES + nodeId + URL_RENDITIONS;
}
protected String getNodeChildrenUrl(String nodeId)
{
return "nodes/" + nodeId + "/children";
return URL_NODES + nodeId + URL_CHILDREN;
}
protected String getNodeContentUrl(String nodeId)
{
return URL_NODES + nodeId + URL_CONTENT;
}
}