You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/01/22 19:18:48 UTC
svn commit: r1560459 - in
/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws:
bindings/BindingPropertiesTest.java saml/SamlTokenTest.java
security/SecurityPolicyTest.java
Author: coheigea
Date: Wed Jan 22 18:18:47 2014
New Revision: 1560459
URL: http://svn.apache.org/r1560459
Log:
Merged revisions 1560455 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1560455 | coheigea | 2014-01-22 18:15:51 +0000 (Wed, 22 Jan 2014) | 2 lines
Fixing tests
........
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java?rev=1560459&r1=1560458&r2=1560459&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java (original)
+++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java Wed Jan 22 18:18:47 2014
@@ -418,12 +418,7 @@ public class BindingPropertiesTest exten
port.doubleIt(25);
fail("Failure expected on not enabling SignatureConfirmation");
} catch (javax.xml.ws.soap.SOAPFaultException ex) {
-<<<<<<< HEAD
- String error = "Check Signature confirmation";
- assertTrue(ex.getMessage().contains(error));
-=======
// expected
->>>>>>> 2234c4b... Refining a recent merge for security errors
}
((java.io.Closeable)port).close();
Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1560459&r1=1560458&r2=1560459&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original)
+++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Wed Jan 22 18:18:47 2014
@@ -246,7 +246,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"));
+ // assertTrue(ex.getMessage().contains("SAML token security failure"));
}
((java.io.Closeable)saml2Port).close();
Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1560459&r1=1560458&r2=1560459&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original)
+++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Wed Jan 22 18:18:47 2014
@@ -605,13 +605,7 @@ public class SecurityPolicyTest extends
pt.doubleIt(5);
fail("should fail on server side when do signature validation due the revoked certificates");
} catch (Exception ex) {
- String errorMessage = ex.getMessage();
- // Different errors using different JDKs...
- assertTrue(errorMessage.contains("Certificate has been revoked")
- || errorMessage.contains("Certificate revocation")
- || errorMessage.contains("Error during certificate path validation")
- || errorMessage.contains(
- "The security token could not be authenticated or authorized"));
+ // expected
}
((java.io.Closeable)pt).close();