[java-identity-provider COMMIT] in /trunk: idp-cas-impl/pom.xml idp-cas-impl/src/main/java/net/shibboleth/idp/cas/con...

[noreply at shibboleth.net]

Author: serac
Date: Fri Oct 31 12:39:05 2014
New Revision: 6812

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6812&view=rev
Log:
Add CAS flow action unit tests.

Added:
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/AbstractFlowActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildProxyChainActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildRelyingPartyContextActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/CheckAuthenticationRequiredActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/GrantServiceTicketActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/TestContextBuilder.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/ValidateIdpSessionActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/ValidateRenewActionTest.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/ValidateTicketActionTest.java
    trunk/idp-cas-impl/src/test/resources/spring/
    trunk/idp-cas-impl/src/test/resources/spring/proxy-authn-test.xml
      - copied unchanged from r6811, trunk/idp-cas-impl/src/test/resources/test/proxy-authn-test.xml
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
Modified:
    trunk/idp-cas-impl/pom.xml
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ConfigLookupFunction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildProxyChainAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticatorTest.java
    trunk/idp-cas-impl/src/test/resources/test/proxy-authn-test.xml
    trunk/idp-cas-impl/src/test/resources/test/test-service-registry.xml
    trunk/idp-parent/pom.xml

Modified: trunk/idp-cas-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/pom.xml?rev=6812&r1=6811&r2=6812&view=diff
==============================================================================
--- trunk/idp-cas-impl/pom.xml (original)
+++ trunk/idp-cas-impl/pom.xml Fri Oct 31 12:39:05 2014
@@ -88,6 +88,17 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ConfigLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ConfigLookupFunction.java?rev=6812&r1=6811&r2=6812&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ConfigLookupFunction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/ConfigLookupFunction.java Fri Oct 31 12:39:05 2014
@@ -46,7 +46,7 @@
     public T apply(@Nullable ProfileRequestContext profileRequestContext) {
         if (profileRequestContext != null) {
             final RelyingPartyContext rpContext = profileRequestContext.getSubcontext(RelyingPartyContext.class, false);
-            if (rpContext != null && configClass.isInstance(rpContext.getConfiguration())) {
+            if (rpContext != null && configClass.isInstance(rpContext.getProfileConfig())) {
                 return configClass.cast(rpContext.getProfileConfig());
             }
         }

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildProxyChainAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildProxyChainAction.java?rev=6812&r1=6811&r2=6812&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildProxyChainAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildProxyChainAction.java Fri Oct 31 12:39:05 2014
@@ -51,7 +51,8 @@
     private final Logger log = LoggerFactory.getLogger(BuildProxyChainAction.class);
 
     /** Manages CAS tickets. */
-    @Nonnull private final TicketService ticketService;
+    @Nonnull
+    private final TicketService ticketService;
 
 
     /**

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/GrantProxyTicketAction.java

[... 48 lines stripped ...]