mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128662 jvonka: V1 REST API test improvements - allow tests to be run individually (as well as within a suite) REPO-896 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129183 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
@@ -1,28 +1,28 @@
|
||||
/*
|
||||
* #%L
|
||||
* Alfresco Remote API
|
||||
* %%
|
||||
* Copyright (C) 2005 - 2016 Alfresco Software Limited
|
||||
* %%
|
||||
* This file is part of the Alfresco software.
|
||||
* If the software was purchased under a paid Alfresco license, the terms of
|
||||
* 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 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 <http://www.gnu.org/licenses/>.
|
||||
* #L%
|
||||
*/
|
||||
/*
|
||||
* #%L
|
||||
* Alfresco Remote API
|
||||
* %%
|
||||
* Copyright (C) 2005 - 2016 Alfresco Software Limited
|
||||
* %%
|
||||
* This file is part of the Alfresco software.
|
||||
* If the software was purchased under a paid Alfresco license, the terms of
|
||||
* 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 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 <http://www.gnu.org/licenses/>.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
package org.alfresco.rest.api.tests;
|
||||
|
||||
@@ -87,65 +87,13 @@ public class TestPersonSites extends EnterpriseTestApi
|
||||
private String site3_title = "b_" + GUID.generate();
|
||||
private SiteRole site3_role = SiteRole.SiteConsumer;
|
||||
|
||||
|
||||
public void initializeSites() throws Exception
|
||||
{
|
||||
/*
|
||||
* Create data for testing the site sorting. We create the sites as
|
||||
* person31 and assign roles to person32. The list requests will be
|
||||
* performed as person32.
|
||||
*/
|
||||
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
|
||||
{
|
||||
@Override
|
||||
public Void doWork() throws Exception
|
||||
{
|
||||
person31 = network1.createUser();
|
||||
person32 = network1.createUser();
|
||||
return null;
|
||||
}
|
||||
}, network1.getId());
|
||||
|
||||
this.site1 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site1_name, site1_title, site1_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site1_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
|
||||
this.site2 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site2_name, site2_title, site2_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site2_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
|
||||
this.site3 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site3_name, site3_title, site3_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site3_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Before
|
||||
public void setup() throws Exception
|
||||
{
|
||||
// init networks
|
||||
super.setup();
|
||||
|
||||
Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
|
||||
|
||||
assertTrue(networksIt.hasNext());
|
||||
@@ -224,6 +172,61 @@ public class TestPersonSites extends EnterpriseTestApi
|
||||
}, person12.getId(), network1.getId());
|
||||
}
|
||||
|
||||
public void initializeSites() throws Exception
|
||||
{
|
||||
/*
|
||||
* Create data for testing the site sorting. We create the sites as
|
||||
* person31 and assign roles to person32. The list requests will be
|
||||
* performed as person32.
|
||||
*/
|
||||
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
|
||||
{
|
||||
@Override
|
||||
public Void doWork() throws Exception
|
||||
{
|
||||
person31 = network1.createUser();
|
||||
person32 = network1.createUser();
|
||||
return null;
|
||||
}
|
||||
}, network1.getId());
|
||||
|
||||
this.site1 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site1_name, site1_title, site1_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site1_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
|
||||
this.site2 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site2_name, site2_title, site2_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site2_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
|
||||
this.site3 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
|
||||
{
|
||||
@Override
|
||||
public TestSite doWork() throws Exception
|
||||
{
|
||||
SiteInformation siteInfo = new SiteInformation(site3_name, site3_title, site3_title, SiteVisibility.PRIVATE);
|
||||
TestSite site = network1.createSite(siteInfo);
|
||||
site.inviteToSite(person32.getId(), site3_role);
|
||||
return site;
|
||||
}
|
||||
}, person31.getId(), network1.getId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPersonSites() throws Exception
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user