Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-23 20:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove adapter test dependencies on MockPrincipal.

Browse Source
This commit is contained in:
Ben Alex 2004-11-01 02:08:42 +00:00
parent 35cdd24abf
commit 29c8e110f5
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java
View File

@ -19,7 +19,6 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority; import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl; import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.adapters.MockPrincipal;
import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken;
import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleException;
@ -243,7 +242,11 @@ public class CatalinaAcegiUserRealmTests extends TestCase {
public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails() { public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails() {
CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm(); CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
assertTrue(!adapter.hasRole(new MockPrincipal(), "ROLE_ONE")); assertTrue(!adapter.hasRole(new Principal() {
public String getName() {
return "MockPrincipal";
}
}, "ROLE_ONE"));
} }
public void testHasRoleWithPrincipalAcegiUserToken() { public void testHasRoleWithPrincipalAcegiUserToken() {
@ -261,8 +264,8 @@ public class CatalinaAcegiUserRealmTests extends TestCase {
throws Exception { throws Exception {
CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm(); CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
URL url = Thread.currentThread().getContextClassLoader().getResource( URL url = Thread.currentThread().getContextClassLoader().getResource("net/sf/acegisecurity/adapters/"
"net/sf/acegisecurity/adapters/" + fileName); + fileName);
if (url == null) { if (url == null) {
throw new Exception("Could not find " + fileName throw new Exception("Could not find " + fileName

7
adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java
View File

@ -19,7 +19,6 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority; import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl; import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.adapters.MockPrincipal;
import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
@ -115,7 +114,11 @@ public class JbossIntegrationFilterTests extends TestCase {
public void testReturnsNullIfPrincipalNotAnAuthenticationImplementation() { public void testReturnsNullIfPrincipalNotAnAuthenticationImplementation() {
JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext( JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext(
makeIntoSubject(new MockPrincipal()))); makeIntoSubject(new Principal() {
public String getName() {
return "MockPrincipal";
}
})));
assertEquals(null, assertEquals(null,
filter.extractFromContainer(new MockHttpServletRequest(null, null))); filter.extractFromContainer(new MockHttpServletRequest(null, null)));
} }

9
adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java
View File

@ -19,7 +19,6 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority; import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl; import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.adapters.MockPrincipal;
import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken;
import java.security.Principal; import java.security.Principal;
@ -257,8 +256,12 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
"net/sf/acegisecurity/adapters/adaptertest-valid.xml"); "net/sf/acegisecurity/adapters/adaptertest-valid.xml");
adapter.setKey(ADAPTER_KEY); adapter.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertTrue(!adapter.isUserInRole(null, null, null, new MockPrincipal(), assertTrue(!adapter.isUserInRole(null, null, null,
"ROLE_ONE")); new Principal() {
public String getName() {
return "MockPrincipal";
}
}, "ROLE_ONE"));
} }
public void testHasRoleWithPrincipalAcegiUserToken() public void testHasRoleWithPrincipalAcegiUserToken()