svn commit: r1557697 - in /cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws: wssec11/WSSecurity111Test.java x509/X509TokenTest.java

[coheigea]

Author: coheigea
Date: Mon Jan 13 12:51:34 2014
New Revision: 1557697

URL: http://svn.apache.org/r1557697
Log:
Re-enabling tests following fixes for WSS-468

Modified:
    
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
    
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java

Modified: 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java?rev=1557697&r1=1557696&r2=1557697&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
 (original)
+++ 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
 Mon Jan 13 12:51:34 2014
@@ -134,9 +134,8 @@ public class WSSecurity111Test extends W
             {new TestParam("A", domPort, true)},
             {new TestParam("A-NoTimestamp", domPort, true)},
             {new TestParam("AD", domPort, true)},
-            // TODO See WSS-468 EncryptBeforeSigning not working 
-            // {new TestParam("A-ES", domPort, true)},
-            // {new TestParam("AD-ES", domPort, true)},
+            {new TestParam("A-ES", domPort, true)},
+            {new TestParam("AD-ES", domPort, true)},
             {new TestParam("UX", domPort, true)},
             {new TestParam("UX-NoTimestamp", domPort, true)},
             {new TestParam("UXD", domPort, true)},
@@ -157,9 +156,8 @@ public class WSSecurity111Test extends W
             {new TestParam("A", staxPort, true)},
             {new TestParam("A-NoTimestamp", staxPort, true)},
             {new TestParam("AD", staxPort, true)},
-            // TODO See WSS-468 EncryptBeforeSigning not working 
-            // {new TestParam("A-ES", staxPort, true)},
-            // {new TestParam("AD-ES", staxPort, true)},
+            {new TestParam("A-ES", staxPort, true)},
+            {new TestParam("AD-ES", staxPort, true)},
             {new TestParam("UX", staxPort, true)},
             {new TestParam("UX-NoTimestamp", staxPort, true)},
             {new TestParam("UXD", staxPort, true)},

Modified: 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1557697&r1=1557696&r2=1557697&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
 (original)
+++ 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
 Mon Jan 13 12:51:34 2014
@@ -182,10 +182,7 @@ public class X509TokenTest extends Abstr
             SecurityTestUtil.enableStreaming(x509Port);
         }
         
-        // TODO WSS-468 Streaming
-        if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
-        }
+        x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -212,10 +209,7 @@ public class X509TokenTest extends Abstr
             SecurityTestUtil.enableStreaming(x509Port);
         }
         
-        // TODO WSS-468 Streaming
-        if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
-        }
+        x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);