Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-26 22:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken portlet test

Browse Source
This commit is contained in:
Luke Taylor 2008-03-31 13:30:29 +00:00
parent 9db55f336c
commit f523cef578
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java
View File

@ -20,9 +20,6 @@ import javax.portlet.PortletRequest;
import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
import org.springframework.security.context.SecurityContext;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.context.SecurityContextImpl;
import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.providers.TestingAuthenticationToken;
import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
import org.springframework.security.ui.portlet.PortletAuthenticationDetails; import org.springframework.security.ui.portlet.PortletAuthenticationDetails;
@ -56,7 +53,7 @@ public class PortletTestUtils {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
public static UserDetails createUser() { public static UserDetails createUser() {
return new User(PortletTestUtils.TESTUSER, PortletTestUtils.TESTCRED, true, true, true, true, return new User(PortletTestUtils.TESTUSER, "dummy", true, true, true, true,
new GrantedAuthority[] {new GrantedAuthorityImpl(TESTROLE1), new GrantedAuthorityImpl(TESTROLE2)}); new GrantedAuthority[] {new GrantedAuthorityImpl(TESTROLE1), new GrantedAuthorityImpl(TESTROLE2)});
} }
@ -65,7 +62,7 @@ public class PortletTestUtils {
request.setUserPrincipal(new TestingAuthenticationToken(TESTUSER, TESTCRED, null)); request.setUserPrincipal(new TestingAuthenticationToken(TESTUSER, TESTCRED, null));
request.addUserRole(PORTALROLE1); request.addUserRole(PORTALROLE1);
request.addUserRole(PORTALROLE2); request.addUserRole(PORTALROLE2);
request.setAuthType(PortletRequest.FORM_AUTH); // request.setAuthType(PortletRequest.FORM_AUTH);
} }
public static MockRenderRequest createRenderRequest() { public static MockRenderRequest createRenderRequest() {
@ -107,6 +104,7 @@ public class PortletTestUtils {
result.setAuthenticated(true); result.setAuthenticated(true);
return result; return result;
} }
public static PreAuthenticatedAuthenticationToken createAuthenticatedToken() { public static PreAuthenticatedAuthenticationToken createAuthenticatedToken() {
return createAuthenticatedToken(createUser()); return createAuthenticatedToken(createUser());
} }