[java-identity-provider COMMIT] in /trunk: idp-profile-api/pom.xml idp-profile-api/src/main/java/net/shibboleth/idp/r...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Dec 11 11:38:27 2011
New Revision: 4087

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4087&view=rev
Log:
Introduce builder class for Spring's RequestContext object graph for use with testing; still need to do a similar thing with SAML messages

Added:
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java   (with props)
Modified:
    trunk/idp-profile-api/pom.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractIdentityProviderActionTest.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ActionTestingSupport.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java
    trunk/idp-profile-impl/pom.xml
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckMandatoryIssuerTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckMandatoryLifetimeTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckSpringRequestContextTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddDoNotCacheConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotBeforeConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/CheckRequestVersionTest.java

Modified: trunk/idp-profile-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/pom.xml?rev=4087&r1=4086&r2=4087&view=diff
==============================================================================
--- trunk/idp-profile-api/pom.xml (original)
+++ trunk/idp-profile-api/pom.xml Sun Dec 11 11:38:27 2011
@@ -52,10 +52,6 @@
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-        </dependency>
         
     </dependencies>
 

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java?rev=4087&r1=4086&r2=4087&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java Sun Dec 11 11:38:27 2011
@@ -55,7 +55,7 @@
      */
     public RelyingPartyConfiguration(final String configurationId, final String responderId,
             final EvaluableCriterion<ProfileRequestContext> criteria,
-            final Collection<ProfileConfiguration> configurations) {
+            final Collection<? extends ProfileConfiguration> configurations) {
         id =
                 Assert.isNotNull(StringSupport.trimOrNull(configurationId),
                         "Relying party configuration ID can not be null or empty");

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractIdentityProviderActionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractIdentityProviderActionTest.java?rev=4087&r1=4086&r2=4087&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractIdentityProviderActionTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractIdentityProviderActionTest.java Sun Dec 11 11:38:27 2011
@@ -68,39 +68,38 @@
         action.setId("foo");
         Assert.assertEquals(action.getId(), "mock");
     }
-    
+
     @Test
-    public void testActionExecution() throws Exception{
-        ProfileRequestContext profileRequestContext = ActionTestingSupport.buildProfileRequestContext();
-        RequestContext springRequestContext = ActionTestingSupport.buildMockSpringRequestContext(profileRequestContext);
-        
+    public void testActionExecution() throws Exception {
+        RequestContext springRequestContext = new RequestContextBuilder().buildRequestContext();
+
         MockIdentityProviderAction action = new MockIdentityProviderAction(null);
         action.setId("mock");
         action.initialize();
-        
+

[... 1113 lines stripped ...]