Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

mark security context as deprecated and use shiro apis instead

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 13:20:26 +02:00
parent 7d0980605e
commit 4a9d14b708
24 changed files with 277 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
View File

@@ -48,6 +48,7 @@ import static org.mockito.Mockito.*;
import java.util.HashSet;
import java.util.Set;
import org.junit.Before;
/**
*
@@ -55,6 +56,11 @@ import java.util.Set;
*/
public class DefaultUserManagerTest extends UserManagerTestBase
{
@Before
public void setAdminSubject(){
setSubject(MockUtil.createAdminSubject());
}
/**
* Method description
@@ -74,8 +80,7 @@ public class DefaultUserManagerTest extends UserManagerTestBase
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
XmlUserDAO userDAO = new XmlUserDAO(factory);
return new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
userDAO, listenerProvider);
return new DefaultUserManager(userDAO, listenerProvider);
}
}

15
scm-webapp/src/test/java/sonia/scm/web/security/DefaultAuthenticationHandlerTest.java
View File

@@ -44,10 +44,11 @@ import sonia.scm.security.EncryptionHandler;
import sonia.scm.security.MessageDigestEncryptionHandler;
import sonia.scm.store.JAXBStoreFactory;
import sonia.scm.store.StoreFactory;
import sonia.scm.user.DefaultUserManager;
import sonia.scm.user.User;
import sonia.scm.user.UserListener;
import sonia.scm.user.UserTestData;
import sonia.scm.user.DefaultUserManager;
import sonia.scm.user.xml.XmlUserDAO;
import sonia.scm.util.MockUtil;
import static org.junit.Assert.*;
@@ -61,7 +62,6 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.user.xml.XmlUserDAO;
/**
*
@@ -141,13 +141,16 @@ public class DefaultAuthenticationHandlerTest extends AbstractTestBase
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
XmlUserDAO userDAO = new XmlUserDAO(storeFactory);
DefaultUserManager userManager =
new DefaultUserManager(MockUtil.getAdminSecurityContextProvider(),
userDAO, listenerProvider);
setSubject(MockUtil.createAdminSubject());
DefaultUserManager userManager = new DefaultUserManager(userDAO,
listenerProvider);
userManager.init(contextProvider);
userManager.create(slarti);
clearSubject();
handler = new DefaultAuthenticationHandler(userManager, enc);
handler.init(contextProvider);
request = MockUtil.getHttpServletRequest();