From d5475c55a56fda61f84adf2ec76bd1b4a1bcdb5b Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Tue, 1 Sep 2015 13:06:28 +0000
Subject: [PATCH] Merge Sabre4 to HEAD    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
---
 .../java/org/alfresco/repo/site/SiteServiceImpl.java  |  2 +-
 .../org/alfresco/repo/site/SiteServiceImplTest.java   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 26ede71de2..94951039c3 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -150,7 +150,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
     // note: caches are tenant-aware (if using EhCacheAdapter shared cache)
     
     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
     
diff --git a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
index e0fb9ba23f..2daa0b1a23 100644
--- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.site;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -1279,7 +1280,15 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
             //exception.printStackTrace();
         }
     }
-    
+
+    public void testDefaults()
+    {
+        assertFalse(this.siteService.isSiteAdmin(null));
+        assertTrue(this.siteService.hasCreateSitePermissions());
+        Comparator<String> comparator = siteServiceImpl.getRoleComparator();
+        assertNotNull(comparator);
+    }
+
     public void testListSiteMemberships()
     {
         String siteName1 = "testMembership1";