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 
129181 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128650 jvonka: V1 REST API: minor fixes (if running within default non-tenant context and single setup)
      - fix couple of failed tests to make sure they're no longer inter-dependent when run in this mode
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:14:44 +00:00
parent d4af90d5ab
commit 19ed99e63a
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,10 +539,10 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
protected Site createSite(String siteTitle, SiteVisibility siteVisibility) throws Exception
{
return createSite(null, siteTitle, siteVisibility);
return createSite(null, siteTitle, siteVisibility, 201);
}
protected Site createSite(String siteId, String siteTitle, SiteVisibility siteVisibility) throws Exception
protected Site createSite(String siteId, String siteTitle, SiteVisibility siteVisibility, int expectedStatus) throws Exception
{
Site site = new Site();
site.setId(siteId);
@@ -550,6 +550,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
site.setVisibility(siteVisibility);
HttpResponse response = publicApiClient.post(getScope(), "sites", null, null, null, toJsonAsStringNonNull(site));
checkStatus(expectedStatus, response.getStatusCode());
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Site.class);
}