root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fixes to match TestingAuthenticationToken changes

This commit is contained in:
Luke Taylor 2008-08-04 13:48:44 +00:00
parent b6d088e40d
commit d6918c88a7
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
portlet/pom.xml
View File

@ -8,14 +8,20 @@
<artifactId>spring-security-portlet</artifactId> <artifactId>spring-security-portlet</artifactId>
<name>Spring Security - Portlet support</name> <name>Spring Security - Portlet support</name>
<description>Spring Security - Support for JSR 168 Portlets</description> <description>Spring Security - Support for JSR 168 Portlets</description>
<version>2.0.4-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>

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

@ -59,7 +59,7 @@ public class PortletTestUtils {
public static void applyPortletRequestSecurity(MockPortletRequest request) { public static void applyPortletRequestSecurity(MockPortletRequest request) {
request.setRemoteUser(TESTUSER); request.setRemoteUser(TESTUSER);
request.setUserPrincipal(new TestingAuthenticationToken(TESTUSER, TESTCRED, null)); request.setUserPrincipal(new TestingAuthenticationToken(TESTUSER, TESTCRED));
request.addUserRole(PORTALROLE1); request.addUserRole(PORTALROLE1);
request.addUserRole(PORTALROLE2); request.addUserRole(PORTALROLE2);
// request.setAuthType(PortletRequest.FORM_AUTH); // request.setAuthType(PortletRequest.FORM_AUTH);

6
portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java
View File

@ -166,8 +166,8 @@ public class PortletProcessingInterceptorTests extends TestCase {
interceptor.setAuthenticationManager(new MockPortletAuthenticationManager()); interceptor.setAuthenticationManager(new MockPortletAuthenticationManager());
interceptor.afterPropertiesSet(); interceptor.afterPropertiesSet();
UsernamePasswordAuthenticationToken testingToken = new UsernamePasswordAuthenticationToken("dummy", "dummy", null); UsernamePasswordAuthenticationToken testingToken = new UsernamePasswordAuthenticationToken("dummy", "dummy");
UsernamePasswordAuthenticationToken baselineToken = new UsernamePasswordAuthenticationToken("dummy", "dummy", null); UsernamePasswordAuthenticationToken baselineToken = new UsernamePasswordAuthenticationToken("dummy", "dummy");
SecurityContextHolder.getContext().setAuthentication(testingToken); SecurityContextHolder.getContext().setAuthentication(testingToken);
// Execute preHandlerAction phase and verify results // Execute preHandlerAction phase and verify results
@ -205,7 +205,7 @@ public class PortletProcessingInterceptorTests extends TestCase {
// Build mock request and response // Build mock request and response
MockActionRequest request = new MockActionRequest(); MockActionRequest request = new MockActionRequest();
MockActionResponse response = new MockActionResponse(); MockActionResponse response = new MockActionResponse();
request.setUserPrincipal(new TestingAuthenticationToken(PortletTestUtils.TESTUSER, PortletTestUtils.TESTCRED, null)); request.setUserPrincipal(new TestingAuthenticationToken(PortletTestUtils.TESTUSER, PortletTestUtils.TESTCRED));
request.setAuthType(PortletRequest.FORM_AUTH); request.setAuthType(PortletRequest.FORM_AUTH);
// Prepare and execute interceptor // Prepare and execute interceptor