From 2a30f9b22fb834400f2dd8cd177b4ad6638fb5c6 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 17 Sep 2012 08:44:22 +0000 Subject: [PATCH] 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 --- .../alfresco/repo/tenant/MultiTDemoTest.java | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java index 42b9f9f36a..b991dd838d 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java +++ b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java @@ -1257,27 +1257,37 @@ public class MultiTDemoTest extends TestCase createTenant(tenantDomain1); String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1); - AuthenticationUtil.runAs(new RunAsWork() + + try { - public Object doWork() throws Exception + AuthenticationUtil.setFullyAuthenticatedUser(tenantAdminName); // note: since SiteServiceImpl.setupSitePermissions currently uses getCurrentUserName (rather than runAs) + + AuthenticationUtil.runAs(new RunAsWork() { - createSite("site1"); - - NodeRef docLib1Ref = siteService.getContainer("site1", SiteService.DOCUMENT_LIBRARY); - NodeRef contentRef = addContent(docLib1Ref, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog", MimetypeMap.MIMETYPE_TEXT_PLAIN); - - createSite("site2"); - - NodeRef docLib2Ref = siteService.getContainer("site2", SiteService.DOCUMENT_LIBRARY); - - nodeService.moveNode(contentRef, docLib2Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("tqbfjotld.txt")); - - // for Share, called via "move-to.post.json.js" -> ScriptSiteService.cleanSitePermissions - siteService.cleanSitePermissions(contentRef, null); - - return null; - } - }, tenantAdminName); + public Object doWork() throws Exception + { + createSite("site1"); + + NodeRef docLib1Ref = siteService.getContainer("site1", SiteService.DOCUMENT_LIBRARY); + NodeRef contentRef = addContent(docLib1Ref, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog", MimetypeMap.MIMETYPE_TEXT_PLAIN); + + createSite("site2"); + + NodeRef docLib2Ref = siteService.getContainer("site2", SiteService.DOCUMENT_LIBRARY); + + nodeService.moveNode(contentRef, docLib2Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("tqbfjotld.txt")); + + // for Share, called via "move-to.post.json.js" -> ScriptSiteService.cleanSitePermissions + siteService.cleanSitePermissions(contentRef, null); + + return null; + } + }, tenantAdminName); + } + finally + { + AuthenticationUtil.clearCurrentSecurityContext(); + } } public void test_ALF_14354()