More tests. Minor refactoring.

cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java

@@ -0,0 +1,49 @@
+package org.springframework.security.cas.userdetails;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.jasig.cas.client.authentication.AttributePrincipal;
+import org.jasig.cas.client.validation.Assertion;
+import org.junit.Test;
+import org.springframework.security.cas.authentication.CasAssertionAuthenticationToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Luke Taylor
+ */
+public class GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests {
+
+    @Test
+    public void correctlyExtractsNamedAttributesFromAssertionAndConvertsThemToAuthorities() {
+        GrantedAuthorityFromAssertionAttributesUserDetailsService uds =
+                new GrantedAuthorityFromAssertionAttributesUserDetailsService(new String[] {"a", "b", "c", "d"});
+        uds.setConvertToUpperCase(false);
+        Assertion assertion = mock(Assertion.class);
+        AttributePrincipal principal = mock(AttributePrincipal.class);
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put("a", Arrays.asList("role_a1", "role_a2"));
+        attributes.put("b", "role_b");
+        attributes.put("c", "role_c");
+        attributes.put("d", null);
+        attributes.put("someother", "unused");
+        when(assertion.getPrincipal()).thenReturn(principal);
+        when(principal.getAttributes()).thenReturn(attributes);
+        when(principal.getName()).thenReturn("somebody");
+        CasAssertionAuthenticationToken token = new CasAssertionAuthenticationToken(assertion, "ticket");
+        UserDetails user = uds.loadUserDetails(token);
+        Set<String> roles = AuthorityUtils.authorityListToSet(user.getAuthorities());
+        assertTrue(roles.size() == 4);
+        assertTrue(roles.contains("role_a1"));
+        assertTrue(roles.contains("role_a2"));
+        assertTrue(roles.contains("role_b"));
+        assertTrue(roles.contains("role_c"));
+    }
+}

cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java

@@ -16,12 +16,15 @@
 package org.springframework.security.cas.web;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
 
+import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.cas.ServiceProperties;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
@@ -35,14 +38,17 @@ public class CasAuthenticationFilterTests {
     //~ Methods ========================================================================================================
 
     @Test
-    public void testGetters() {
+    public void testGettersSetters() {
         CasAuthenticationFilter filter = new CasAuthenticationFilter();
         assertEquals("/j_spring_cas_security_check", filter.getFilterProcessesUrl());
+        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+        filter.setProxyReceptorUrl("/someurl");
+        filter.setServiceProperties(new ServiceProperties());
     }
 
     @Test
     public void testNormalOperation() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
+        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/j_spring_cas_security_check");
         request.addParameter("ticket", "ST-0-ER94xMJmn6pha35CQRoZ");
 
         CasAuthenticationFilter filter = new CasAuthenticationFilter();
@@ -52,6 +58,8 @@ public class CasAuthenticationFilterTests {
             }
         });
 
+        assertTrue(filter.requiresAuthentication(request, new MockHttpServletResponse()));
+
         Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
         assertTrue(result != null);
     }

cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java

@@ -15,40 +15,43 @@
 
 package org.springframework.security.cas.web;
 
+import static junit.framework.Assert.*;
+
+import org.junit.Test;
+import org.springframework.security.cas.SamlServiceProperties;
 import org.springframework.security.cas.ServiceProperties;
 
-import junit.framework.TestCase;
-
-
 /**
  * Tests {@link ServiceProperties}.
  *
  * @author Ben Alex
  */
-public class ServicePropertiesTests extends TestCase {
+public class ServicePropertiesTests {
     //~ Methods ========================================================================================================
 
-    public void testDetectsMissingLoginFormUrl() throws Exception {
+    @Test(expected=IllegalArgumentException.class)
+    public void detectsMissingService() throws Exception {
         ServiceProperties sp = new ServiceProperties();
-
-        try {
-            sp.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("service must be specified.", expected.getMessage());
-        }
-    }
-
-    public void testGettersSetters() throws Exception {
-        ServiceProperties sp = new ServiceProperties();
-        sp.setSendRenew(false);
-        assertFalse(sp.isSendRenew());
-        sp.setSendRenew(true);
-        assertTrue(sp.isSendRenew());
-
-        sp.setService("https://mycompany.com/service");
-        assertEquals("https://mycompany.com/service", sp.getService());
-
         sp.afterPropertiesSet();
     }
+
+    @Test
+    public void testGettersSetters() throws Exception {
+        ServiceProperties[] sps = {new ServiceProperties(), new SamlServiceProperties()};
+        for(ServiceProperties sp : sps) {
+            sp.setSendRenew(false);
+            assertFalse(sp.isSendRenew());
+            sp.setSendRenew(true);
+            assertTrue(sp.isSendRenew());
+            sp.setArtifactParameter("notticket");
+            assertEquals("notticket", sp.getArtifactParameter());
+            sp.setServiceParameter("notservice");
+            assertEquals("notservice", sp.getServiceParameter());
+
+            sp.setService("https://mycompany.com/service");
+            assertEquals("https://mycompany.com/service", sp.getService());
+
+            sp.afterPropertiesSet();
+        }
+    }
 }