Merge pull request #50 from battags/CASC-207

CASC-207 - Converted to static logger for serializable class
This commit is contained in:
Scott 2013-06-19 07:12:31 -07:00
commit 2c1043190f
2 changed files with 9 additions and 6 deletions

View File

@ -44,12 +44,9 @@ import java.net.URLEncoder;
public final class Cas20ProxyRetriever implements ProxyRetriever {
/** Unique Id for serialization. */
private static final long serialVersionUID = 560409469568911791L;
private static final long serialVersionUID = 560409469568911792L;
/**
* Instance of Commons Logging.
*/
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private static final Logger logger = LoggerFactory.getLogger(Cas20ProxyRetriever.class);
/**
* Url to CAS server.

View File

@ -136,7 +136,7 @@ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValida
+ USERNAME
+ "</cas:user><cas:proxyGrantingTicket>"
+ PGTIOU
+ "</cas:proxyGrantingTicket><cas:attributes><cas:password>test</cas:password><cas:eduPersonId>id</cas:eduPersonId><cas:longAttribute>test1\n\ntest</cas:longAttribute></cas:attributes></cas:authenticationSuccess></cas:serviceResponse>";
+ "</cas:proxyGrantingTicket><cas:attributes><cas:password>test</cas:password><cas:eduPersonId>id</cas:eduPersonId><cas:longAttribute>test1\n\ntest</cas:longAttribute><cas:multivaluedAttribute>value1</cas:multivaluedAttribute><cas:multivaluedAttribute>value2</cas:multivaluedAttribute></cas:attributes></cas:authenticationSuccess></cas:serviceResponse>";
server.content = RESPONSE.getBytes(server.encoding);
final Assertion assertion = this.ticketValidator.validate("test", "test");
@ -144,6 +144,12 @@ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValida
assertEquals("test", assertion.getPrincipal().getAttributes().get("password"));
assertEquals("id", assertion.getPrincipal().getAttributes().get("eduPersonId"));
assertEquals("test1\n\ntest", assertion.getPrincipal().getAttributes().get("longAttribute"));
try {
List<?> multivalued = (List<?>) assertion.getPrincipal().getAttributes().get("multivaluedAttribute");
assertArrayEquals(new String[]{"value1", "value2"}, multivalued.toArray());
} catch (Exception e) {
fail("'multivaluedAttribute' attribute expected as List<Object> object.");
}
//assertEquals(PGT, assertion.getProxyGrantingTicketId());
}