From 1c12cbbafbf89babffa902c79e8286052630d33f Mon Sep 17 00:00:00 2001 From: Gethin James Date: Tue, 1 Sep 2015 13:07:14 +0000 Subject: [PATCH] Merge Sabre4 to HEAD 111082: Adding additional test coverage to SiteServiceImplTest RA-528 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/site/SiteServiceImplTest.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java index 5705feda41..0616344268 100644 --- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java @@ -43,6 +43,8 @@ import org.alfresco.repo.dictionary.M2Type; import org.alfresco.repo.jscript.ClasspathScriptLocation; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; import org.alfresco.repo.node.archive.NodeArchiveService; +import org.alfresco.repo.node.getchildren.FilterProp; +import org.alfresco.repo.node.getchildren.FilterPropString; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -500,6 +502,8 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest assertEquals(preexistingSitesCount + 5, sites.size()); List sitesFromFind = this.siteService.findSites(null, null, 100); assertEquals(preexistingSitesCount + 5, sitesFromFind.size()); + sitesFromFind = this.siteService.findSites(null, 100); + assertEquals(preexistingSitesCount + 5, sitesFromFind.size()); List siteFromFind = this.siteService.findSites(null, null, 1); assertEquals("SiteService.findSites did not limit results", (sites.isEmpty() ? 0 : 1), siteFromFind.size()); @@ -510,7 +514,15 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest // However 'findSites' allows CONTAINS matching. sitesFromFind = this.siteService.findSites("One", null, 100); assertEquals("Matched wrong number of sites named 'One'", 1, sitesFromFind.size()); - + + List filterProps = new ArrayList(); + filterProps.add(new FilterPropString(ContentModel.PROP_NAME, "mySiteO", FilterPropString.FilterTypeString.STARTSWITH_IGNORECASE)); + PagingResults pageSite = this.siteService.listSites(filterProps, null, new PagingRequest(100)); + assertNotNull(pageSite); + assertNotNull(pageSite.getQueryExecutionId()); + assertNotNull(pageSite.getTotalResultCount()); + assertFalse(pageSite.hasMoreItems()); + // Get sites by matching title sites = this.siteService.listSites(testTitlePrefix, null); assertNotNull(sites); @@ -526,7 +538,8 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest assertEquals("Matched wrong number of sites named 'description'", 5, sitesFromFind.size()); // Get sites by matching sitePreset - see ALF-5620 - // SiteService.findSites does not support finding by sitePreset and so is not tested here. + sites = this.siteService.findSites(null, TEST_SITE_PRESET, 100); + assertNotNull(sites); sites = this.siteService.listSites(null, TEST_SITE_PRESET); assertNotNull(sites); assertEquals("Matched wrong number of sites with PRESET", 2, sites.size());