diff --git a/source/test-java/org/alfresco/rest/api/tests/TestSites.java b/source/test-java/org/alfresco/rest/api/tests/TestSites.java index 55b05d84d5..c90f579159 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestSites.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestSites.java @@ -1,4 +1,4 @@ -/* +/* * #%L * Alfresco Remote API * %% @@ -9,95 +9,95 @@ * the paid license agreement will prevail. Otherwise, the software is * provided under the following open source license terms: * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.rest.api.tests; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.alfresco.repo.tenant.TenantUtil; -import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; -import org.alfresco.rest.api.tests.RepoService.TestNetwork; -import org.alfresco.rest.api.tests.RepoService.TestSite; -import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse; -import org.alfresco.rest.api.tests.client.PublicApiClient.Paging; -import org.alfresco.rest.api.tests.client.PublicApiClient.Sites; -import org.alfresco.rest.api.tests.client.PublicApiException; -import org.alfresco.rest.api.tests.client.RequestContext; -import org.alfresco.rest.api.tests.client.data.Site; -import org.alfresco.rest.api.tests.client.data.SiteImpl; -import org.alfresco.rest.api.tests.client.data.SiteRole; -import org.alfresco.service.cmr.site.SiteVisibility; -import org.alfresco.util.GUID; -import org.apache.commons.httpclient.HttpStatus; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.rest.api.tests; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.alfresco.repo.tenant.TenantUtil; +import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; +import org.alfresco.rest.api.tests.RepoService.TestNetwork; +import org.alfresco.rest.api.tests.RepoService.TestSite; +import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse; +import org.alfresco.rest.api.tests.client.PublicApiClient.Paging; +import org.alfresco.rest.api.tests.client.PublicApiClient.Sites; +import org.alfresco.rest.api.tests.client.PublicApiException; +import org.alfresco.rest.api.tests.client.RequestContext; +import org.alfresco.rest.api.tests.client.data.Site; +import org.alfresco.rest.api.tests.client.data.SiteImpl; +import org.alfresco.rest.api.tests.client.data.SiteRole; +import org.alfresco.service.cmr.site.SiteVisibility; +import org.alfresco.util.GUID; +import org.apache.commons.httpclient.HttpStatus; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.junit.Before; +import org.junit.Test; + /** - * V1 REST API tests for managing Sites - * + * V1 REST API tests for managing Sites + * * @author sglover * @author janv */ -public class TestSites extends EnterpriseTestApi -{ - private TestNetwork network1; - private String person1Id; +public class TestSites extends EnterpriseTestApi +{ + private TestNetwork network1; + private String person1Id; private String person2Id; private Site site1; private Site site2; private Site site3; - - @Override - @Before - public void - setup() throws Exception - { - // init networks - super.setup(); - - // Test: user is member of an account - this.network1 = getTestFixture().getRandomNetwork(); - Iterator personIt = network1.getPersonIds().iterator(); + @Override + @Before + public void + setup() throws Exception + { + // init networks + super.setup(); + + // Test: user is member of an account + this.network1 = getTestFixture().getRandomNetwork(); + + Iterator personIt = network1.getPersonIds().iterator(); + + this.person1Id = personIt.next(); + assertNotNull(person1Id); - this.person1Id = personIt.next(); - assertNotNull(person1Id); - this.person2Id = personIt.next(); assertNotNull(person2Id); - } - - @Test - public void testSites() throws Exception - { - Sites sitesProxy = publicApiClient.sites(); - - // create & get sites (as person 2) - { - publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id)); - + } + + @Test + public void testGetSiteAndListSites() throws Exception + { + Sites sitesProxy = publicApiClient.sites(); + + // create & get sites (as person 2) + { + publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id)); + String siteTitle = "site 1 " + System.currentTimeMillis(); Site site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString()); site1 = sitesProxy.createSite(site); @@ -120,61 +120,67 @@ public class TestSites extends EnterpriseTestApi site3.expected(ret); } - List expectedSites = TenantUtil.runAsUserTenant(new TenantRunAsWork>() - { - @Override - public List doWork() throws Exception - { - List sites = network1.getSites(person1Id); - return sites; - } - }, person1Id, network1.getId()); - - { + List expectedSites = TenantUtil.runAsUserTenant(new TenantRunAsWork>() + { + @Override + public List doWork() throws Exception + { + List sites = network1.getSites(person1Id); + return sites; + } + }, person1Id, network1.getId()); + + { publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); - int skipCount = 0; - int maxItems = 2; - Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size()); - ListResponse resp = sitesProxy.getSites(createParams(paging, null)); - checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp); - } - - { + int skipCount = 0; + int maxItems = 2; + Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size()); + ListResponse resp = sitesProxy.getSites(createParams(paging, null)); + checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp); + } + + { publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); - int skipCount = 2; - int maxItems = Integer.MAX_VALUE; - Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size()); - ListResponse resp = sitesProxy.getSites(createParams(paging, null)); - checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp); - } - + int skipCount = 2; + int maxItems = Integer.MAX_VALUE; + Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size()); + ListResponse resp = sitesProxy.getSites(createParams(paging, null)); + checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp); + } + } + + @Test + public void testCreateAndDeleteSite() throws Exception + { + Sites sitesProxy = publicApiClient.sites(); + // test create and delete site - { + { publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); String siteTitle = "my site !*#$ 123"; String siteDescription = "my site description"; - + SiteImpl site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString()); site.setDescription(siteDescription); - Site ret = sitesProxy.createSite(site); + Site ret = sitesProxy.createSite(site); String siteId = ret.getSiteId(); - + String expectedSiteId = "my-site-123"; Site siteExp = new SiteImpl(null, expectedSiteId, ret.getGuid(), siteTitle, siteDescription, SiteVisibility.PRIVATE.toString(), null, SiteRole.SiteManager); - siteExp.expected(ret); - - ret = sitesProxy.getSite(siteId); - siteExp.expected(ret); - - sitesProxy.removeSite(siteId); - + siteExp.expected(ret); + + ret = sitesProxy.getSite(siteId); + siteExp.expected(ret); + + sitesProxy.removeSite(siteId); + // -ve test - ie. cannot get site after it has been deleted sitesProxy.getSite(siteId, 404); - } + } // test create + permanent delete + create { @@ -190,6 +196,8 @@ public class TestSites extends EnterpriseTestApi sitesProxy.removeSite(siteId, true, 204); sitesProxy.createSite(site); + + sitesProxy.removeSite(siteId); // cleanup } // test create using site id = "true" (RA-1101) @@ -202,28 +210,46 @@ public class TestSites extends EnterpriseTestApi Site site = new SiteImpl(null, siteId, null, siteTitle, siteDescription, SiteVisibility.PUBLIC.toString(), null, null); sitesProxy.createSite(site); + + sitesProxy.removeSite(siteId); // cleanup } // -ve tests { + publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id)); + + SiteImpl site = new SiteImpl("a private site", SiteVisibility.PRIVATE.toString()); + String siteIdOfPrivateSite = sitesProxy.createSite(site, 201).getSiteId(); + + site = new SiteImpl("a public site", SiteVisibility.PUBLIC.toString()); + String siteIdOfPublicSite = sitesProxy.createSite(site, 201).getSiteId(); + // invalid auth publicApiClient.setRequestContext(new RequestContext(network1.getId(), GUID.generate(), "password")); - sitesProxy.getSite(site1.getSiteId(), 401); + sitesProxy.getSite(siteIdOfPrivateSite, 401); publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); // -ve - cannot view or delete a private site - sitesProxy.getSite(site1.getSiteId(), 404); - sitesProxy.removeSite(site1.getSiteId(), false, 404); - + sitesProxy.getSite(siteIdOfPrivateSite, 404); + sitesProxy.removeSite(siteIdOfPrivateSite, false, 404); + // -ve - test cannot delete a public site (but can view it) - sitesProxy.getSite(site2.getSiteId(), 200); - sitesProxy.removeSite(site2.getSiteId(), false, 403); + sitesProxy.getSite(siteIdOfPublicSite, 200); + sitesProxy.removeSite(siteIdOfPublicSite, false, 403); + + // cleanup + publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id)); + sitesProxy.removeSite(siteIdOfPrivateSite, false, 204); + sitesProxy.removeSite(siteIdOfPublicSite, false, 204); + + + publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); // -ve - try to get unknown site sitesProxy.getSite(GUID.generate(), 404); - SiteImpl site = new SiteImpl("my site 123", "invalidsitevisibility"); + site = new SiteImpl("my site 123", "invalidsitevisibility"); sitesProxy.createSite(site, 400); site = new SiteImpl(null, "invalid site id", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null); @@ -296,42 +322,42 @@ public class TestSites extends EnterpriseTestApi sitesProxy.createSite(site); } - // -ve - minor: error code if updating via nodes api (REPO-512) + // -ve - minor: error code if updating via nodes api (REPO-512) + { + String siteId = "zzz"; + String siteTitle = "ZZZ site"; + + Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PRIVATE.toString(), null, null); + String siteNodeId = sitesProxy.createSite(site).getGuid(); + + // try to update to invalid site visibility + JSONObject prop = new JSONObject(); + prop.put("st:siteVisibility","INVALID"); + JSONObject properties = new JSONObject(); + properties.put("properties", new JSONObject(prop)); + try + { + sitesProxy.update("nodes", siteNodeId, null, null, properties.toJSONString(), null); + fail(); + } catch (PublicApiException e) + { + assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode()); + } + + sitesProxy.removeSite(siteId); // cleanup + } + + // -ve test - cannot create multiple sites in single POST call (unsupported) + { + List sites = new ArrayList<>(2); + sites.add(new SiteImpl(null, "siteA1", null, "siteA1", null, SiteVisibility.PRIVATE.toString(), null, null)); + sites.add(new SiteImpl(null, "siteB1", null, "siteB1", null, SiteVisibility.PRIVATE.toString(), null, null)); + + sitesProxy.create("sites", null, null, null, JSONArray.toJSONString(sites), null, 405); + } + + // -ve tests - belts-and-braces for unsupported methods { - String siteId = "zzz"; - String siteTitle = "ZZZ site"; - - Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PRIVATE.toString(), null, null); - String siteNodeId = sitesProxy.createSite(site).getGuid(); - - // try to update to invalid site visibility - JSONObject prop = new JSONObject(); - prop.put("st:siteVisibility","INVALID"); - JSONObject properties = new JSONObject(); - properties.put("properties", new JSONObject(prop)); - try - { - sitesProxy.update("nodes", siteNodeId, null, null, properties.toJSONString(), null); - fail(); - } catch (PublicApiException e) - { - assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode()); - } - - sitesProxy.removeSite(siteId); // cleanup - } - - // -ve test - cannot create multiple sites in single POST call (unsupported) - { - List sites = new ArrayList<>(2); - sites.add(new SiteImpl(null, "siteA1", null, "siteA1", null, SiteVisibility.PRIVATE.toString(), null, null)); - sites.add(new SiteImpl(null, "siteB1", null, "siteB1", null, SiteVisibility.PRIVATE.toString(), null, null)); - - sitesProxy.create("sites", null, null, null, JSONArray.toJSONString(sites), null, 405); - } - - // -ve tests - belts-and-braces for unsupported methods - { publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id)); // -ve - cannot call POST method on /sites/siteId @@ -356,8 +382,8 @@ public class TestSites extends EnterpriseTestApi } // Test Case cloud-1478 - // Test Case cloud-1479 - // user invited to network and user invited to site - // user invited to network and user not invited to site - } -} + // Test Case cloud-1479 + // user invited to network and user invited to site + // user invited to network and user not invited to site + } +}