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

57055: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56523: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56443: (MNT-9756) ALF-19225: Made post feeds cleanup to be executed in the unit test tear down method, to clean Pending, Error and etc. feeds.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:03:22 +00:00
parent 7b0bd9b5dd
commit 5e2c285efd
3 changed files with 18 additions and 4 deletions

View File

@@ -155,6 +155,7 @@ public class SubscriptionServiceActivitiesTest
{
// We put the scheduler in standby mode BeforeClass. Now we must restore it.
QUARTZ_SCHEDULER.start();
AuthenticationUtil.clearCurrentSecurityContext();
}
@Before public void createTestSites() throws Exception
@@ -171,6 +172,7 @@ public class SubscriptionServiceActivitiesTest
modSite2 = testSites.createSite("sitePreset", "mod2" + guid, "", "", SiteVisibility.MODERATED, ADMIN);
log.debug("Created some test sites...");
AuthenticationUtil.clearCurrentSecurityContext();
// test site cleanup is handled automatically by the JUnit Rule.
}