improve PermissionUtil

This commit is contained in:
Sebastian Sdorra
2011-01-06 12:44:18 +01:00
parent d9f496d425
commit dfef03f074
8 changed files with 229 additions and 44 deletions

View File

@@ -38,8 +38,9 @@ package sonia.scm.util;
import com.google.inject.Provider;
import sonia.scm.SCMContextProvider;
import sonia.scm.security.SecurityContext;
import sonia.scm.user.User;
import sonia.scm.web.security.DummyWebSecurityContext;
import sonia.scm.web.security.WebSecurityContext;
import static org.mockito.Mockito.*;
@@ -63,17 +64,14 @@ public class MockUtil
*
* @return
*/
public static Provider<SecurityContext> getAdminSecurityContextProvider()
public static Provider<WebSecurityContext> getAdminSecurityContextProvider()
{
User admin = new User("scmadmin", "SCM Admin", "scmadmin@scm.org");
admin.setAdmin(true);
SecurityContext context = mock(SecurityContext.class);
when(context.getUser()).thenReturn(admin);
Provider<SecurityContext> scp = mock(Provider.class);
DummyWebSecurityContext context = new DummyWebSecurityContext(admin);
Provider<WebSecurityContext> scp = mock(Provider.class);
when(scp.get()).thenReturn(context);