Fix failing unit tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java

@@ -116,13 +116,13 @@ public class RepoDictionaryDAOTest extends TestCase
     
     private void initDictionaryCaches(DictionaryDAOImpl dictionaryDAO)
     {
-        SimpleCache<String,DictionaryRegistry> dictionaryCache = new DefaultSimpleCache<String, DictionaryRegistry>(11, getClass().getName());   
+        SimpleCache<String,DictionaryRegistry> dictionaryCache = new DefaultSimpleCache<String, DictionaryRegistry>(11, getClass().getName() + ".dictionary");
         dictionaryDAO.setDictionaryRegistryCache(dictionaryCache);
     }
     
     private void initNamespaceCaches(NamespaceDAOImpl namespaceDAO)
     {
-        SimpleCache<String, NamespaceRegistry> namespaceCache = new NullCache<String, NamespaceRegistry>();   
+        SimpleCache<String, NamespaceRegistry> namespaceCache = new DefaultSimpleCache<String, NamespaceRegistry>(11, getClass().getName() + ".namespace");
         namespaceDAO.setNamespaceRegistryCache(namespaceCache);
     }
     

source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java

@@ -206,10 +206,6 @@ public class SubscriptionServiceActivitiesTest extends TestCase
                 createSite(userId1+"mod2", SiteVisibility.MODERATED);
                 siteService.setMembership(userId1+"mod2", userId1, SiteModel.SITE_MANAGER);
                 
-                return null;
-            }
-        }, AuthenticationUtil.getAdminUserName());
-        
                 List<String> feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 0, feed.size());
                 
@@ -225,6 +221,10 @@ public class SubscriptionServiceActivitiesTest extends TestCase
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 0, feed.size());
                 
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName());
+        
         AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
         {
             @Override
@@ -245,14 +245,22 @@ public class SubscriptionServiceActivitiesTest extends TestCase
             }
         }, userId2);
         
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+        {
+            @Override
+            public Object doWork() throws Exception
+            {
                 // userId1 + 5, userId2 + 2
                 generateFeed();
                 
-        feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
+                List<String> feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 7, feed.size());
                 
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 2, feed.size());
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName());
         
         AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
         {
@@ -268,28 +276,24 @@ public class SubscriptionServiceActivitiesTest extends TestCase
             }
         }, userId1);
         
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+        {
+            @Override
+            public Object doWork() throws Exception
+            {
                 // userId1 + 5, userId2 + 1
                 generateFeed();
                 
-        feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
+                List <String> feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 12, feed.size());
                 
                 // note: userId2 should not see activities from followers in moderated sites that they do not belong do (ALF-16460)
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 3, feed.size());
 
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
-        {
-            @Override
-            public Object doWork() throws Exception
-            {
                 siteService.setMembership(userId1+"priv2", userId2, SiteModel.SITE_CONSUMER);
                 siteService.setMembership(userId1+"mod2", userId2, SiteModel.SITE_MANAGER);
                 
-                return null;
-            }
-        }, AuthenticationUtil.getAdminUserName());
-        
                 // userId1 + 2, userId2 + 2
                 generateFeed();
                 
@@ -300,6 +304,10 @@ public class SubscriptionServiceActivitiesTest extends TestCase
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 5, feed.size());
 
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName());
+                
         AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
         {
             @Override
@@ -315,53 +323,44 @@ public class SubscriptionServiceActivitiesTest extends TestCase
             }
         }, userId1);
         
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+        {
+            @Override
+            public Object doWork() throws Exception
+            {
                 // userId1 + 5, userId2 + 3
                 generateFeed();
                 
-        feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
+                List<String> feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 19, feed.size());
                 
                 // note: userId2 should not see activities from followers in moderated sites that they do not belong do (ALF-16460)
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 8, feed.size());
                 
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
-        {
-            @Override
-            public Object doWork() throws Exception
-            {
                 deleteSite(userId1+"pub");
                 deleteSite(userId1+"priv1");
                 deleteSite(userId1+"priv2");
                 deleteSite(userId1+"mod1");
                 deleteSite(userId1+"mod2");
                 
-                return null;
-            }
-        }, AuthenticationUtil.getAdminUserName());
-        
                 feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 2, feed.size());
                 
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 2, feed.size());
                 
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
-        {
-            @Override
-            public Object doWork() throws Exception
-            {
                 deletePerson(userId1);
                 deletePerson(userId2);
                 
-                return null;
-            }
-        }, AuthenticationUtil.getAdminUserName());
-        
                 feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 0, feed.size());
                 
                 feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
                 assertEquals(feed.toString(), 0, feed.size());
+
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName());       
     }
 }