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 
132587 rmunteanu: REPO-1543: Refactor tests for list site filtering
      - site are now created with a default site preset
      - refactored tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-10 17:01:06 +00:00
parent d17fef60dc
commit 271e40d2f3
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -120,6 +120,8 @@ public class SitesImpl implements Sites
private static final String SITE_ID_VALID_CHARS_PARTIAL_REGEX = "A-Za-z0-9\\-";
private static final String DEFAULT_SITE_PRESET = "site-dashboard";
private final static Map<String,QName> SORT_PARAMS_TO_QNAMES;
static
{
@@ -1102,7 +1104,7 @@ public class SitesImpl implements Sites
SiteInfo siteInfo = null;
try
{
siteInfo = siteService.createSite(site.getPreset() != null ? site.getPreset() : "sitePreset", site.getId(), site.getTitle(), site.getDescription(), site.getVisibility());
siteInfo = siteService.createSite(DEFAULT_SITE_PRESET, site.getId(), site.getTitle(), site.getDescription(), site.getVisibility());
}
catch (SiteServiceException sse)
{

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

@@ -516,7 +516,7 @@ public class RepoService
*/
public TestSite createSite(TestNetwork network, final SiteInformation siteInfoIn)
{
SiteInfo siteInfoOut = siteService.createSite(TEST_SITE_PRESET, siteInfoIn.getShortName(), siteInfoIn.getTitle(), siteInfoIn.getDescription(), siteInfoIn.getSiteVisibility());
SiteInfo siteInfoOut = siteService.createSite(siteInfoIn.getSitePreset() != null ? siteInfoIn.getSitePreset() : 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);
@@ -1378,6 +1378,13 @@ public class RepoService
return createSite(siteInfo);
}
public TestSite createSite(String id, String title, String description, String sitePreset, SiteVisibility visibility)
{
SiteInformation siteInfo = new SiteInformation(id, title, description, sitePreset, visibility);
// Used deprecated createSite method until will be allowed creating a site with sitePreset
return createSite(siteInfo);
}
public TestSite createSite(SiteVisibility siteVisibility)
{
return createSite(null, siteVisibility);
@@ -1954,6 +1961,12 @@ public class RepoService
this.siteVisibility = siteVisibility;
}
public SiteInformation(String shortName, String title, String description, String sitePreset, SiteVisibility siteVisibility)
{
this(shortName, title, description, siteVisibility);
this.sitePreset = sitePreset;
}
public String getShortName()
{
return shortName;

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

@@ -181,25 +181,20 @@ public class TestSites extends EnterpriseTestApi
}
}, network3.getId());
publicApiClient.setRequestContext(new RequestContext(network3.getId(), person4Id));
Sites sitesProxy = publicApiClient.sites();
Site site = new SiteImpl().withSiteId("a-" + GUID.generate()).withTitle("site A" + GUID.generate()).withDescription(siteDescription)
.withVisibility(SiteVisibility.PRIVATE.toString()).withPreset(preset);
site7 = sitesProxy.createSite(site);
site = new SiteImpl().withSiteId("b-" + GUID.generate()).withTitle("site B" + GUID.generate()).withDescription(siteDescription)
.withVisibility(SiteVisibility.PUBLIC.toString()).withPreset(preset);
site8 = sitesProxy.createSite(site);
site = new SiteImpl().withSiteId("c-" + GUID.generate()).withTitle("site C" + GUID.generate()).withDescription(siteDescription)
.withVisibility(SiteVisibility.PUBLIC.toString()).withPreset(preset);
site9 = sitesProxy.createSite(site);
site = new SiteImpl().withSiteId("d-" + GUID.generate()).withTitle("site D" + GUID.generate()).withDescription(siteDescription)
.withVisibility(SiteVisibility.MODERATED.toString()).withPreset("site-dashboard");
site10 = sitesProxy.createSite(site);
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
// Temporary solution for testing as for now creating a site
// with site preset is not allowed (please see REPO-194)
site7 = network3.createSite("a-" + GUID.generate(), "site A" + GUID.generate(), siteDescription, preset, SiteVisibility.PRIVATE);
site8 = network3.createSite("b-" + GUID.generate(), "site B" + GUID.generate(), siteDescription, preset, SiteVisibility.PUBLIC);
site9 = network3.createSite("c-" + GUID.generate(), "site C" + GUID.generate(), siteDescription, preset, SiteVisibility.PUBLIC);
site10 = network3.createSite("d-" + GUID.generate(), "site D" + GUID.generate(), siteDescription, "site-dashboard", SiteVisibility.MODERATED);
return null;
}
}, person4Id, network3.getId());
}
}