cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] git commit: Re-enabling test
Date Fri, 21 Feb 2014 11:34:56 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 7705a925f -> 60ced92f7


Re-enabling test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2b3bb5e4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b3bb5e4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b3bb5e4

Branch: refs/heads/master
Commit: 2b3bb5e434082422a1631a434b3bd346c0ae766c
Parents: 7705a92
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Feb 21 11:22:20 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Feb 21 11:22:20 2014 +0000

----------------------------------------------------------------------
 .../apache/cxf/systest/ws/x509/X509TokenTest.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2b3bb5e4/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 8e95e63..633116c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -128,15 +128,15 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
         
-        // TODO Wait until we pick up WSS4J 2.0.0-SNAPSHOT again
-        if (PORT.equals(test.getPort())) {
-            try {
-                x509Port.doubleIt(25);
-                fail("Failure expected on an incorrect key");
-            } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-                String error = "No certificates were found for decryption";
-                assertTrue(ex.getMessage().contains(error));
+        try {
+            x509Port.doubleIt(25);
+            fail("Failure expected on an incorrect key");
+        } catch (javax.xml.ws.soap.SOAPFaultException ex) {
+            String error = "No certificates were found for decryption";
+            if (STAX_PORT.equals(test.getPort())) {
+                error = "Referenced security token could not be retrieved";
             }
+            assertTrue(ex.getMessage().contains(error));
         }
         
         ((java.io.Closeable)x509Port).close();


Mime
View raw message