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 API-STRIKES-BACK (5.2.0) to HEAD (5.2)

Browse Source 
125708 jvonka: RA-779 / RA-780: Sites API - fix (create site + permanent delete + create site with same site id)
   - RA-967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 21:37:56 +00:00
parent f31d286c8c
commit aee533110c
4 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/test-java/org/alfresco/rest/api/tests/TestSites.java
View File

@@ -22,8 +22,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
@@ -156,11 +158,28 @@ public class TestSites extends EnterpriseTestApi
sitesProxy.removeSite(siteId);
// -ve test - ie. cannot get site after it has been deleted
sitesProxy.getSite(siteId, 404);
}
// -ve tests
{
// test create + permanent delete + create
{
String siteId = "bbb";
String siteTitle = "BBB site";
Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PUBLIC.toString(), null, null);
sitesProxy.createSite(site);
// permanent site delete (bypass trashcan/archive)
sitesProxy.removeSite(siteId, true, 204);
sitesProxy.createSite(site);
}
// -ve tests
{
// invalid auth
publicApiClient.setRequestContext(new RequestContext(network1.getId(), GUID.generate(), "password"));
sitesProxy.getSite(site1.getSiteId(), 401);
@@ -169,23 +188,23 @@ public class TestSites extends EnterpriseTestApi
// -ve - cannot view or delete a private site
sitesProxy.getSite(site1.getSiteId(), 404);
sitesProxy.removeSite(site1.getSiteId(), 404);
sitesProxy.removeSite(site1.getSiteId(), false, 404);
// -ve - test cannot delete a public site (but can view it)
sitesProxy.getSite(site2.getSiteId(), 200);
sitesProxy.removeSite(site2.getSiteId(), 403);
sitesProxy.removeSite(site2.getSiteId(), false, 403);
// -ve - try to get unknown site
sitesProxy.getSite(GUID.generate(), 404);
SiteImpl site = new SiteImpl("my site 123", "invalidsitevisibility");
sitesProxy.createSite(site, 400);
sitesProxy.createSite(site, 400);
site = new SiteImpl(null, "invalid site id", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
sitesProxy.createSite(site, 400);
site = new SiteImpl(null, "invalid site id", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
sitesProxy.createSite(site, 400);
site = new SiteImpl(null, "invalidsiteid*", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
sitesProxy.createSite(site, 400);
site = new SiteImpl(null, "invalidsiteid*", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
sitesProxy.createSite(site, 400);
site = new SiteImpl();
site.setSiteId(new String(new char[72]).replace('\0', 'a'));
@@ -223,9 +242,32 @@ public class TestSites extends EnterpriseTestApi
site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString());
String siteId = sitesProxy.createSite(site, 201).getSiteId();
sitesProxy.createSite(site, 409);
sitesProxy.removeSite(siteId, 204); // cleanup
sitesProxy.removeSite(siteId); // cleanup
sitesProxy.removeSite(GUID.generate(), 404);
sitesProxy.removeSite(GUID.generate(), false, 404);
}
// -ve - cannot create site with same site id as an existing site (even if it is in the trashcan/archive)
{
String siteId = "aaa";
String siteTitle = "AAA site";
Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PUBLIC.toString(), null, null);
String siteNodeId = sitesProxy.createSite(site).getGuid();
// -ve - duplicate site id
sitesProxy.createSite(site, 409);
sitesProxy.removeSite(siteId);
// -ve - duplicate site id (even if site is in trashcan)
sitesProxy.createSite(site, 409);
// now purge the site
sitesProxy.remove("deleted-nodes", siteNodeId, null, null, "Cannot purge site");
sitesProxy.createSite(site);
}
{

18
source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
View File

@@ -27,6 +27,7 @@ import java.math.BigInteger;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -737,14 +738,14 @@ public class PublicApiClient
public HttpResponse remove(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String errorMessage) throws PublicApiException
{
return remove(entityCollectionName, entityId, relationCollectionName, relationId, errorMessage, HttpServletResponse.SC_NO_CONTENT);
return remove(entityCollectionName, entityId, relationCollectionName, relationId, null, errorMessage, HttpServletResponse.SC_NO_CONTENT);
}
public HttpResponse remove(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String errorMessage, int expectedStatus) throws PublicApiException
public HttpResponse remove(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String,String> params, String errorMessage, int expectedStatus) throws PublicApiException
{
try
{
HttpResponse response = delete("public", entityCollectionName, entityId, relationCollectionName, relationId);
HttpResponse response = delete("public", 1, entityCollectionName, entityId, relationCollectionName, relationId, params);
checkStatus(errorMessage, expectedStatus, response);
return response;
}
@@ -838,12 +839,17 @@ public class PublicApiClient
public void removeSite(String siteId) throws PublicApiException
{
removeSite(siteId, 204);
removeSite(siteId, false, 204);
}
public void removeSite(String siteId, int expectedStatus) throws PublicApiException
public void removeSite(String siteId, boolean permanent, int expectedStatus) throws PublicApiException
{
remove("sites", siteId, null, null, "Failed to remove site", expectedStatus);
Map<String, String> params = null;
if (permanent)
{
params = Collections.singletonMap("permanent", "true");
}
remove("sites", siteId, null, null, params, "Failed to remove site", expectedStatus);
}
public ListResponse<SiteContainer> getSiteContainers(String siteId, Map<String, String> params) throws PublicApiException