cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1470984 - in /cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j: DOMToStaxRoundTripTest.java StaxRoundTripTest.java StaxToDOMEncryptionIdentifierTest.java
Date Tue, 23 Apr 2013 14:43:30 GMT
Author: coheigea
Date: Tue Apr 23 14:43:30 2013
New Revision: 1470984

URL: http://svn.apache.org/r1470984
Log:
Some changes following WSS4J changes

Modified:
    cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
    cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
    cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java

Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java?rev=1470984&r1=1470983&r2=1470984&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
(original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
Tue Apr 23 14:43:30 2013
@@ -477,8 +477,9 @@ public class DOMToStaxRoundTripTest exte
         service.getInInterceptors().add(inhandler);
         
         WSSSecurityProperties outProperties = new WSSSecurityProperties();
-        outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE_CONFIRMATION});
+        outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE});
         outProperties.setSignatureUser("myalias");
+        outProperties.setEnableSignatureConfirmation(true);
         
         Properties outCryptoProperties = 
             CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader());

Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java?rev=1470984&r1=1470983&r2=1470984&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
(original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
Tue Apr 23 14:43:30 2013
@@ -381,8 +381,9 @@ public class StaxRoundTripTest extends A
         service.getInInterceptors().add(inhandler);
         
         WSSSecurityProperties outProperties = new WSSSecurityProperties();
-        outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE_CONFIRMATION});
+        outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE});
         outProperties.setSignatureUser("myalias");
+        outProperties.setEnableSignatureConfirmation(true);
         
         Properties outCryptoProperties = 
             CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader());

Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java?rev=1470984&r1=1470983&r2=1470984&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
(original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
Tue Apr 23 14:43:30 2013
@@ -191,9 +191,7 @@ public class StaxToDOMEncryptionIdentifi
         assertEquals("test", echo.echo("test"));
     }
     
-    // TODO
     @Test
-    @org.junit.Ignore
     public void testEncryptEncryptedKeySHA1() throws Exception {
         // Create + configure service
         Service service = createService();
@@ -216,7 +214,7 @@ public class StaxToDOMEncryptionIdentifi
         properties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.ENCRYPT});
         properties.setEncryptionUser("myalias");
         properties.setEncryptionKeyIdentifier(
-            WSSecurityTokenConstants.KeyIdentifier_EncryptedKey
+            WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier
         );
         
         Properties cryptoProperties = 



Mime
View raw message