[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBui...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Dec 14 19:16:24 2011
New Revision: 4088

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4088&view=rev
Log:
more action impls, unit testing, and bug fixing

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/Saml2ActionSupport.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/package-info.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertions.java   (contents, props changed)
      - copied, changed from r4085, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertion.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertionsTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotBeforeConditionToAssertionsTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotOnOrAfterConditionToAssertionsTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddOneTimeUseConditionToAssertionsTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddResponseShellTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/Saml2ActionTestingSupport.java   (with props)
Removed:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertion.java
Modified:
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml1/Saml1ActionSupport.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddDoNotCacheConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShell.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotBeforeConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddOneTimeUseConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddResponseShell.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/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/CheckRequestVersionTest.java

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java?rev=4088&r1=4087&r2=4088&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java Wed Dec 14 19:16:24 2011
@@ -390,9 +390,13 @@
      * 
      * @return the constructed {@link BasicMessageMetadataSubcontext}
      */
-    @NotNull
+    @Null
     protected BasicMessageMetadataSubcontext buildInboudMessageMetadataContext(
             @NotNull final MessageContext inboundMsgCtx) {
+        if(ObjectSupport.equals(NO_VAL, inboundMessageId) && ObjectSupport.equals(NO_VAL, inboundMessageIssuer)){
+            return null;
+        }
+        
         final BasicMessageMetadataSubcontext metadataCtx = new BasicMessageMetadataSubcontext(inboundMsgCtx);
 
         if (ObjectSupport.equals(NO_VAL, inboundMessageId)) {
@@ -453,8 +457,12 @@
     @NotNull
     protected BasicMessageMetadataSubcontext buildOutboundMessageMetadataContext(
             @NotNull final MessageContext outboundMsgCtx) {
+        if(ObjectSupport.equals(NO_VAL, outboundMessageId) && ObjectSupport.equals(NO_VAL, outboundMessageIssuer)){
+            return null;
+        }
+
         final BasicMessageMetadataSubcontext metadataCtx = new BasicMessageMetadataSubcontext(outboundMsgCtx);
-
+        
         if (ObjectSupport.equals(NO_VAL, outboundMessageId)) {
             metadataCtx.setMessageId(ActionTestingSupport.OUTBOUND_MSG_ID);
         } else {


[... 843 lines stripped ...]