cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1545676 - in /cxf/trunk: services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/ services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/ systests/ws-security/src/test/java/org/apache/cxf/sys...
Date Tue, 26 Nov 2013 14:44:35 GMT
Author: coheigea
Date: Tue Nov 26 14:44:35 2013
New Revision: 1545676

URL: http://svn.apache.org/r1545676
Log:
Re-enabling tests following WSS4J upgrade

Modified:
    cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/StaxAsymmetricBindingTest.java
    cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxPartsTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/StaxSWAPolicyTest.java

Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/StaxAsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/StaxAsymmetricBindingTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/StaxAsymmetricBindingTest.java
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/StaxAsymmetricBindingTest.java
Tue Nov 26 14:44:35 2013
@@ -159,9 +159,7 @@ public class StaxAsymmetricBindingTest e
         bus.shutdown(true);
     }
 
-    // TODO (WSS-484) Uncomment when we upgrade to WSS4J 2.0-SNAPSHOT again
     @org.junit.Test
-    @org.junit.Ignore
     public void testUsernameTokenSAML1Encrypted() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();

Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
Tue Nov 26 14:44:35 2013
@@ -153,9 +153,7 @@ public class StaxSymmetricBindingTest ex
         bus.shutdown(true);
     }
     
-    // TODO (WSS-484) Uncomment when we upgrade to WSS4J 2.0-SNAPSHOT again
     @org.junit.Test
-    @org.junit.Ignore
     public void testUsernameTokenSAML1Encrypted() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = StaxSymmetricBindingTest.class.getResource("cxf-client.xml");

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
Tue Nov 26 14:44:35 2013
@@ -462,9 +462,7 @@ public class PartsTest extends AbstractB
         bus.shutdown(true);
     }
     
-    // TODO - re-enable once we move off WSS4J 2.0-beta
     @org.junit.Test
-    @org.junit.Ignore
     public void testSignedAttachments() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -525,9 +523,7 @@ public class PartsTest extends AbstractB
         bus.shutdown(true);
     }
     
-    // TODO - re-enable once we move off WSS4J 2.0-beta
     @org.junit.Test
-    @org.junit.Ignore
     public void testEncryptedAttachments() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxPartsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxPartsTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxPartsTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxPartsTest.java
Tue Nov 26 14:44:35 2013
@@ -275,7 +275,6 @@ public class StaxPartsTest extends Abstr
         updateAddressPort(port, PORT);
         
         // DOM
-        /* TODO See WSS-482 - Remove comment when we move off WSS4J RC
         try {
             port.doubleIt(25);
             fail("Failure expected on a header which isn't signed");
@@ -293,7 +292,6 @@ public class StaxPartsTest extends Abstr
             // String error = "To must be signed";
             // assertTrue(ex.getMessage().contains(error));
         }
-        */
         
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -406,8 +404,6 @@ public class StaxPartsTest extends Abstr
         port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT);
         
-        /*
-          TODO See WSS-482 - Remove comment when we move off WSS4J RC
         // DOM
         try {
             port.doubleIt(25);
@@ -426,7 +422,7 @@ public class StaxPartsTest extends Abstr
             // String error = "To must be encrypted";
             // assertTrue(ex.getMessage().contains(error));
         }
-        */
+        
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
     }
@@ -466,9 +462,7 @@ public class StaxPartsTest extends Abstr
         bus.shutdown(true);
     }
 
-    // TODO - re-enable once we move off WSS4J 2.0-beta
     @org.junit.Test
-    @org.junit.Ignore
     public void testSignedAttachments() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -529,9 +523,7 @@ public class StaxPartsTest extends Abstr
         bus.shutdown(true);
     }
     
-    // TODO - re-enable once we move off WSS4J 2.0-beta
     @org.junit.Test
-    @org.junit.Ignore
     public void testEncryptedAttachments() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
Tue Nov 26 14:44:35 2013
@@ -35,8 +35,6 @@ import org.junit.BeforeClass;
 /**
  * A set of tests for the SwA specification (SOAP with Attachments)
  */
-// TODO Wait until we move off the WSS4J 2.0 beta release
-@org.junit.Ignore
 public class SWAActionTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(Server.class);
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
Tue Nov 26 14:44:35 2013
@@ -39,8 +39,6 @@ import org.junit.BeforeClass;
  * 
  * It tests both DOM + StAX clients against the DOM server
  */
-//TODO Wait until we move off the WSS4J 2.0 beta release
-@org.junit.Ignore
 public class SWAPolicyTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(PolicyServer.class);
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/StaxSWAPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/StaxSWAPolicyTest.java?rev=1545676&r1=1545675&r2=1545676&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/StaxSWAPolicyTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/StaxSWAPolicyTest.java
Tue Nov 26 14:44:35 2013
@@ -39,8 +39,6 @@ import org.junit.BeforeClass;
  * 
  * It tests both DOM + StAX clients against the StAX server
  */
-//TODO Wait until we move off the WSS4J 2.0 beta release
-@org.junit.Ignore
 public class StaxSWAPolicyTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(StaxPolicyServer.class);
 



Mime
View raw message