Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

41642: MT: fix unit test/build (ALF-12732)


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

source/java/org/alfresco/repo/tenant/MultiTDemoTest.java

@@ -1257,6 +1257,11 @@ public class MultiTDemoTest extends TestCase
         createTenant(tenantDomain1);
         
         String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
+        
+        try
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser(tenantAdminName); // note: since SiteServiceImpl.setupSitePermissions currently uses getCurrentUserName (rather than runAs)
+            
             AuthenticationUtil.runAs(new RunAsWork<Object>()
             {
                 public Object doWork() throws Exception
@@ -1279,6 +1284,11 @@ public class MultiTDemoTest extends TestCase
                 }
             }, tenantAdminName);
         }
+        finally
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
     
     public void test_ALF_14354()
     {