inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Sabre4 to HEAD

Browse Source 
111026: Adding additional test coverage to SiteServiceImplTest RA-528


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2015-09-01 13:06:28 +00:00
parent 204df6a3c3
commit d5475c55a5
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
// note: caches are tenant-aware (if using EhCacheAdapter shared cache) // note: caches are tenant-aware (if using EhCacheAdapter shared cache)
private SimpleCache<String, Object> singletonCache; // eg. for siteHomeNodeRef private SimpleCache<String, Object> singletonCache; // eg. for siteHomeNodeRef
private final String KEY_SITEHOME_NODEREF = "key.sitehome.noderef"; private static final String KEY_SITEHOME_NODEREF = "key.sitehome.noderef";
private SimpleCache<String, NodeRef> siteNodeRefCache; // for site shortname to nodeRef lookup private SimpleCache<String, NodeRef> siteNodeRefCache; // for site shortname to nodeRef lookup

9
source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.site;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -1280,6 +1281,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
} }
} }
public void testDefaults()
{
assertFalse(this.siteService.isSiteAdmin(null));
assertTrue(this.siteService.hasCreateSitePermissions());
Comparator<String> comparator = siteServiceImpl.getRoleComparator();
assertNotNull(comparator);
}
public void testListSiteMemberships() public void testListSiteMemberships()
{ {
String siteName1 = "testMembership1"; String siteName1 = "testMembership1";