Make DMS Sample work post-Spring Security 2 refactor.

This commit is contained in:
Ben Alex
2007-12-03 04:05:33 +00:00
parent 47229be5cb
commit b44b748452
10 changed files with 74 additions and 47 deletions

View File

@@ -1,5 +1,5 @@
import org.acegisecurity.context.SecurityContextHolder;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import sample.dms.AbstractElement;
@@ -20,9 +20,9 @@ public class DmsIntegrationTests extends AbstractTransactionalDataSourceSpringCo
return new String[] {"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-insecure.xml"};
}
public void tearDown() {
protected void onTearDown() throws Exception {
SecurityContextHolder.clearContext();
}
}
public void setDocumentDao(DocumentDao documentDao) {
this.documentDao = documentDao;
@@ -35,7 +35,7 @@ public class DmsIntegrationTests extends AbstractTransactionalDataSourceSpringCo
}
public void testMarissaRetrieval() {
process("marissa", "koala", false);
process("rod", "koala", false);
}
public void testScottRetrieval() {

View File

@@ -1,4 +1,4 @@
import org.acegisecurity.acls.AclService;
import org.springframework.security.acls.AclService;
@@ -31,7 +31,7 @@ public class SecureDmsIntegrationTests extends DmsIntegrationTests {
}
/*
public void testItOut() {
SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("marissa", "password", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_SUPERVISOR")}));
SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("rod", "password", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_SUPERVISOR")}));
AbstractElement[] elements = documentDao.findElements(Directory.ROOT_DIRECTORY);
@@ -43,7 +43,7 @@ public class SecureDmsIntegrationTests extends DmsIntegrationTests {
}*/
public void testMarissaRetrieval() {
process("marissa", "koala", true);
process("rod", "koala", true);
}