svn commit: r1524118 - in /webservices/wss4j/branches/1_6_x-fixes: src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java

[co...@apache.org]

Author: coheigea
Date: Tue Sep 17 16:28:30 2013
New Revision: 1524118

URL: http://svn.apache.org/r1524118
Log:
Putting the test in the right place

Added:
    webservices/wss4j/branches/1_6_x-fixes/src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java
      - copied, changed from r1524115, webservices/wss4j/branches/1_6_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
Removed:
    webservices/wss4j/branches/1_6_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java

Copied: webservices/wss4j/branches/1_6_x-fixes/src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java (from r1524115, webservices/wss4j/branches/1_6_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java?p2=webservices/wss4j/branches/1_6_x-fixes/src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java&p1=webservices/wss4j/branches/1_6_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java&r1=1524115&r2=1524118&rev=1524118&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/test/java/org/apache/ws/security/handler/UseReqSigCertTest.java Tue Sep 17 16:28:30 2013
@@ -17,22 +17,23 @@
  * under the License.
  */
 
-package org.apache.wss4j.dom.handler;
+package org.apache.ws.security.handler;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.util.XMLUtils;
-import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSSConfig;
-import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
-import org.apache.wss4j.dom.common.CustomHandler;
-import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
-import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.common.CustomHandler;
+import org.apache.ws.security.common.KeystoreCallbackHandler;
+import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.ws.security.util.XMLUtils;
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 
 /**
@@ -43,11 +44,6 @@ public class UseReqSigCertTest extends o
     private static final org.slf4j.Logger LOG = 
         org.slf4j.LoggerFactory.getLogger(UseReqSigCertTest.class);
     
-    @org.junit.AfterClass
-    public static void cleanup() throws Exception {
-        SecurityTestUtil.cleanup();
-    }
-    
     public UseReqSigCertTest() throws Exception {
         WSSConfig.init();
     }
@@ -203,14 +199,15 @@ public class UseReqSigCertTest extends o
         reqData.setWssConfig(cfg);
         
         java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
-        config.put(WSHandlerConstants.SIG_VER_PROP_FILE, "wss40.properties");
+        config.put(WSHandlerConstants.SIG_PROP_FILE, "wss40.properties");
         reqData.setMsgContext(config);
         
         CustomHandler handler = new CustomHandler();
         handler.receive(action, reqData);
         
         WSSecurityEngine securityEngine = new WSSecurityEngine();
-        return securityEngine.processSecurityHeader(doc, "", reqData);
+        Element securityHeader = WSSecurityUtil.getSecurityHeader(doc, "");
+        return securityEngine.processSecurityHeader(securityHeader, reqData);
     }
     
     private void sendResponse(List<WSHandlerResult> handlerResults) throws Exception {