[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/binding/CheckMessageVersi...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jan 30 15:49:50 2014
New Revision: 3588

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3588&view=rev
Log:
Turn request version handler into more general message handler.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/CheckMessageVersionHandler.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/CheckMessageVersionHandlerTest.java
      - copied, changed from r3587, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/CheckRequestVersionHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/CheckRequestVersionHandlerTest.java

Copied: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/CheckMessageVersionHandlerTest.java (from r3587, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/CheckMessageVersionHandlerTest.java?p2=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/CheckMessageVersionHandlerTest.java&p1=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java&r1=3587&r2=3588&rev=3588&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/CheckRequestVersionHandlerTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/CheckMessageVersionHandlerTest.java Thu Jan 30 15:49:50 2014
@@ -15,48 +15,72 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml1.binding;
+package org.opensaml.saml.common.binding;
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.MessageHandlerException;
+import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.SAMLVersion;
 import org.opensaml.saml.saml1.core.RequestAbstractType;
 import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
-import org.testng.Assert;
+import org.opensaml.saml.saml2.core.AttributeQuery;
+import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
 import org.testng.annotations.Test;
 
-/** {@link CheckRequestVersionHandler} unit test. */
-public class CheckRequestVersionHandlerTest extends OpenSAMLInitBaseTestCase {
+/** {@link CheckMessageVersionHandler} unit test. */
+public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
 
     /** Test that the handler accepts SAML 1.0 and 1.1 messages. */
-    @Test public void testSaml1Message() throws MessageHandlerException, ComponentInitializationException {
-        MessageContext<RequestAbstractType> messageCtx = new MessageContext<>();
+    @Test
+    public void testSaml1Message() throws MessageHandlerException, ComponentInitializationException {
+        MessageContext<SAMLObject> messageCtx = new MessageContext<>();
         messageCtx.setMessage(SAML1ActionTestingSupport.buildAttributeQueryRequest(null));
 
-        CheckRequestVersionHandler handler = new CheckRequestVersionHandler();
+        CheckMessageVersionHandler handler = new CheckMessageVersionHandler();
         handler.initialize();
         
         handler.invoke(messageCtx);
     }
 
     /** Test that the handler errors out on SAML 2 messages. */
-    @Test public void testSaml2Message() throws MessageHandlerException, ComponentInitializationException {
-        MessageContext<RequestAbstractType> messageCtx = new MessageContext<>();
+    @Test(expectedExceptions = MessageHandlerException.class)
+    public void testSaml2MessageFail() throws MessageHandlerException, ComponentInitializationException {
+        MessageContext<SAMLObject> messageCtx = new MessageContext<>();
         messageCtx.setMessage(SAML1ActionTestingSupport.buildAttributeQueryRequest(null));
-        messageCtx.getMessage().setVersion(SAMLVersion.VERSION_20);
+        ((RequestAbstractType) messageCtx.getMessage()).setVersion(SAMLVersion.VERSION_20);
 
-        CheckRequestVersionHandler handler = new CheckRequestVersionHandler();
+        CheckMessageVersionHandler handler = new CheckMessageVersionHandler();
         handler.initialize();
         
-        try {
-            handler.invoke(messageCtx);
-            Assert.fail();
-        } catch (MessageHandlerException e) {
-            
-        }
+        handler.invoke(messageCtx);
     }
-    
+ 

[... 27 lines stripped ...]