Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57163: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57016: Reverse Merge to the original
         56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
               which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
               See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
            56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
                  Added JUnit test for the issue. Added the test to SecurityTestSuite.
            56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 
            56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               << last commit missed a file >>
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 20:14:29 +00:00
parent ed0e48861d
commit 7ec5353411
4 changed files with 159 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -28,6 +28,7 @@ import org.alfresco.repo.security.authentication.AuthenticationTest;
import org.alfresco.repo.security.authentication.AuthorizationTest;
import org.alfresco.repo.security.authentication.ChainingAuthenticationServiceTest;
import org.alfresco.repo.security.authentication.NameBasedUserNameGeneratorTest;
import org.alfresco.repo.security.authority.AuthorityBridgeTableAsynchronouslyRefreshedCacheTest;
import org.alfresco.repo.security.authority.AuthorityServiceTest;
import org.alfresco.repo.security.authority.DuplicateAuthorityTest;
import org.alfresco.repo.security.authority.ExtendedPermissionServiceTest;
@@ -76,7 +77,8 @@ public class SecurityTestSuite extends TestSuite
// suite.addTestSuite(ChainingUserRegistrySynchronizerTest.class);
suite.addTestSuite(OwnableServiceTest.class);
suite.addTestSuite(ReadPermissionTest.class);
suite.addTestSuite(AuthorizationTest.class);
suite.addTestSuite(AuthorizationTest.class);
suite.addTestSuite(AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.class);
suite.addTest(new JUnit4TestAdapter(HomeFolderProviderSynchronizerTest.class));