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 
131113 jvonka: REST API Tests: minor pre-work (mark RepoService.createSite as deprecated, remove exists/delete)
   - build attempt
   - REPO-1344, REPO-112


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:30:53 +00:00
parent 04c7261d59
commit 2b6dea5bbc
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/test-java/org/alfresco/rest/api/tests/RepoService.java
View File

@@ -209,7 +209,7 @@ public class RepoService
protected Activities activities;
protected PublicApiTestContext publicApiContext;
protected Random random = new Random(System.currentTimeMillis());
protected static int numNetworks = 0;
@@ -511,33 +511,21 @@ public class RepoService
});
}
public TestSite createSite(TestNetwork network, final SiteInformation site)
/**
* @deprecated
*/
public TestSite createSite(TestNetwork network, final SiteInformation siteInfoIn)
{
SiteInfo siteInfo = null;
if(siteService.hasSite(site.getShortName()))
{
AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
siteService.deleteSite(site.getShortName());
return null;
}
});
}
siteInfo = siteService.createSite(TEST_SITE_PRESET, site.getShortName(), site.getTitle(), site.getDescription(), site.getSiteVisibility());
siteService.createContainer(site.getShortName(), "documentLibrary", ContentModel.TYPE_FOLDER, null);
final TestSite testSite = new TestSite(network, siteInfo);
SiteInfo siteInfoOut = siteService.createSite(TEST_SITE_PRESET, siteInfoIn.getShortName(), siteInfoIn.getTitle(), siteInfoIn.getDescription(), siteInfoIn.getSiteVisibility());
siteService.createContainer(siteInfoIn.getShortName(), "documentLibrary", ContentModel.TYPE_FOLDER, null);
final TestSite testSite = new TestSite(network, siteInfoOut);
log("Created site " + testSite + (network != null ? " in network " + network : ""));
return testSite;
}
public Invitation rejectSiteInvitation(String personId, String siteId)
{
Invitation ret = null;
@@ -1390,6 +1378,9 @@ public class RepoService
return createSite(siteInfo);
}
/**
* @deprecated replace with AbstractBaseApiTest.createSite (or PublicApiClient.sites.createSite)
*/
public TestSite createSite(final SiteInformation site)
{
TestSite testSite = RepoService.this.createSite(this, site);