svn commit: r1457604 - in /cxf/branches/wss4j2.0-port: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java

[coheigea]

Author: coheigea
Date: Mon Mar 18 00:05:09 2013
New Revision: 1457604

URL: http://svn.apache.org/r1457604
Log:
Fixing some more tests

Modified:
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
    
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1457604&r1=1457603&r2=1457604&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 Mon Mar 18 00:05:09 2013
@@ -1737,7 +1737,7 @@ public abstract class AbstractBindingBui
             }            
         }
         
-        ais = getAllAssertionsByLocalname(SPConstants.WSS10);
+        ais = getAllAssertionsByLocalname(SPConstants.WSS11);
         if (!ais.isEmpty()) {
             for (AssertionInfo ai : ais) {
                 return (Wss10)ai.getAssertion();

Modified: 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1457604&r1=1457603&r2=1457604&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
 Mon Mar 18 00:05:09 2013
@@ -192,7 +192,7 @@ public class SamlTokenTest extends Abstr
             saml2Port.doubleIt(25);
             fail("Expected failure on an invocation with a invalid SAML2 
Assertion");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            assertTrue(ex.getMessage().contains("SAML token security 
failure"));
+            // expected
         }
         
         ((java.io.Closeable)saml2Port).close();