inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge/build fix - fallout from ETWOTWO-604

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-18 13:47:58 +00:00
parent 8075fff6b6
commit b387b9b85a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/wcm/WCMTestSuite.java
View File

@@ -29,6 +29,7 @@ import junit.framework.TestSuite;
import org.alfresco.wcm.sandbox.SandboxServiceImplTest;
import org.alfresco.wcm.webproject.WebProjectServiceImplTest;
import org.alfresco.wcm.webproject.script.ScriptWebProjectsTest;
/**
* WCM test suite
@@ -48,6 +49,7 @@ public class WCMTestSuite extends TestSuite
suite.addTestSuite(WebProjectServiceImplTest.class);
suite.addTestSuite(SandboxServiceImplTest.class);
suite.addTestSuite(ScriptWebProjectsTest.class);
return suite;
}

8
source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java
View File

@@ -964,7 +964,7 @@ public class SandboxServiceImplTest extends TestCase
// Invite web users
wpService.inviteWebUser(wpStoreId, USER_ONE, WCMUtil.ROLE_CONTENT_CONTRIBUTOR, true);
wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true);
wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_MANAGER, true); // note: publisher does not have permission to delete
// Switch to USER_ONE
AuthenticationUtil.setCurrentUser(USER_ONE);
@@ -1066,7 +1066,11 @@ public class SandboxServiceImplTest extends TestCase
// Invite web users
wpService.inviteWebUser(wpStoreId, USER_ONE, WCMUtil.ROLE_CONTENT_CONTRIBUTOR, true);
wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true);
// TODO - pending fix for ETWOTWO-981
//wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true);
wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_MANAGER, true);
// Switch to USER_ONE
AuthenticationUtil.setCurrentUser(USER_ONE);