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 2013/10/21 17:48:55 UTC
svn commit: r1534241 - in /cxf/trunk/systests:
ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/
ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/
ws-security/src/test/java/org/apache/cxf/systest/ws/x509/
Author: coheigea
Date: Mon Oct 21 15:48:54 2013
New Revision: 1534241
URL: http://svn.apache.org/r1534241
Log:
Re-enabling some Derived key streaming tests following the fix for WSS-480
Modified:
cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxX509TokenTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java
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/StaxX509TokenTest.java
Modified: cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxX509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxX509TokenTest.java?rev=1534241&r1=1534240&r2=1534241&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxX509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxX509TokenTest.java Mon Oct 21 15:48:54 2013
@@ -125,10 +125,8 @@ public class StaxX509TokenTest extends A
/**
* 2.2.3 (WSS1.1) Anonymous with X.509 Certificate, Sign, Encrypt
- * TODO Support streaming derived
*/
@org.junit.Test
- @org.junit.Ignore
public void testSymmetricSignEncrypt() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -148,9 +146,9 @@ public class StaxX509TokenTest extends A
// DOM
x509Port.doubleIt(25);
- // TODO - Support derived Streaming
- // SecurityTestUtil.enableStreaming(x509Port);
- // x509Port.doubleIt(25);
+ // Streaming
+ SecurityTestUtil.enableStreaming(x509Port);
+ x509Port.doubleIt(25);
((java.io.Closeable)x509Port).close();
bus.shutdown(true);
@@ -158,10 +156,8 @@ public class StaxX509TokenTest extends A
/**
* 2.2.4 (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt
- * TODO - Support streaming Endorsing
*/
@org.junit.Test
- @org.junit.Ignore
public void testSymmetricEndorsing() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java?rev=1534241&r1=1534240&r2=1534241&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java Mon Oct 21 15:48:54 2013
@@ -81,14 +81,14 @@ public class StaxWSSecurity111Test exten
String[] argv = new String[] {
"A",
"A-NoTimestamp",
- // TODO Derived hanging - "AD",
+ "AD",
"A-ES",
- // TODO Derived hanging - "AD-ES",
+ "AD-ES",
"UX",
"UX-NoTimestamp",
- // TODO Derived hanging - "UXD",
+ "UXD",
"UX-SEES",
- // TODO Derived hanging - "UXD-SEES",
+ "UXD-SEES",
};
runClientServer(argv, unrestrictedPoliciesInstalled, false, true);
}
@@ -103,14 +103,14 @@ public class StaxWSSecurity111Test exten
String[] argv = new String[] {
"A",
"A-NoTimestamp",
- // TODO Derived hanging "AD",
+ "AD",
// TODO See WSS-468 EncryptBeforeSigning not working "A-ES",
- // TODO Derived hanging "AD-ES",
+ // TODO WSS-468 Ordering issue same as above "AD-ES",
"UX",
"UX-NoTimestamp",
- // TODO Derived hanging "UXD",
+ "UXD",
"UX-SEES",
- // TODO Derived hanging "UXD-SEES",
+ "UXD-SEES",
};
runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false, true);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java?rev=1534241&r1=1534240&r2=1534241&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java Mon Oct 21 15:48:54 2013
@@ -88,23 +88,17 @@ public class StaxWSSecurity112Test exten
"X-AES128",
"X-AES256",
"X-TripleDES",
- /*
- * TODO Derived
"XD",
"XD-ES",
- "XD-SEES",
- */
+ // TODO Investigate "XD-SEES",
};
} else {
argv = new String[] {
"X",
"X-NoTimestamp",
- /*
- * TODO Derived
"XD",
"XD-ES",
- "XD-SEES",
- */
+ // TODO Investigate "XD-SEES",
};
}
runClientServer(argv, unrestrictedPoliciesInstalled, true, true);
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=1534241&r1=1534240&r2=1534241&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 Oct 21 15:48:54 2013
@@ -105,7 +105,7 @@ public class WSSecurity111Test extends W
"A-NoTimestamp",
"AD",
// TODO See WSS-468 EncryptBeforeSigning not working "A-ES",
- // TODO See WSS-468 Derived "AD-ES",
+ // TODO See WSS-468 Ordering issue as above "AD-ES",
"UX",
"UX-NoTimestamp",
"UXD",
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1534241&r1=1534240&r2=1534241&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java Mon Oct 21 15:48:54 2013
@@ -99,9 +99,7 @@ public class StaxX509TokenTest extends A
bus.shutdown(true);
}
- // TODO WSS-469
@org.junit.Test
- @org.junit.Ignore
public void testKeyIdentifierDerived() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -121,9 +119,9 @@ public class StaxX509TokenTest extends A
// DOM
x509Port.doubleIt(25);
- // TODO WSS-469 Streaming
- // SecurityTestUtil.enableStreaming(x509Port);
- // x509Port.doubleIt(25);
+ // Streaming
+ SecurityTestUtil.enableStreaming(x509Port);
+ x509Port.doubleIt(25);
((java.io.Closeable)x509Port).close();
bus.shutdown(true);
@@ -157,9 +155,7 @@ public class StaxX509TokenTest extends A
bus.shutdown(true);
}
- // TODO WSS-469
@org.junit.Test
- @org.junit.Ignore
public void testKeyIdentifierEncryptBeforeSigningDerived() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -179,7 +175,7 @@ public class StaxX509TokenTest extends A
// DOM
x509Port.doubleIt(25);
- // TODO WSS-469 Streaming
+ // TODO WSS-468 Streaming
// SecurityTestUtil.enableStreaming(x509Port);
// x509Port.doubleIt(25);