[java-opensaml COMMIT] in /trunk/opensaml-soap-impl/src/test: java/org/opensaml/soap/soap11/SOAPTest.java java/org/op...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Apr  2 23:04:36 2012
New Revision: 3017

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3017&view=rev
Log:
Align test resources with new package naming.

Added:
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/
      - copied from r3015, trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/soap/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wssecurity/
      - copied from r3015, trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wssecurity/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wssecurity/impl/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wssecurity/impl/UsernameToken.xml
      - copied unchanged from r3015, trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wssecurity/UsernameToken.xml
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wstrust/
      - copied from r3015, trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wstrust/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wstrust/impl/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wstrust/impl/RequestSecurityToken.xml
      - copied unchanged from r3015, trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wstrust/RequestSecurityToken.xml
Removed:
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wssecurity/UsernameToken.xml
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/soap/wstrust/RequestSecurityToken.xml
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/soap/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wssecurity/
    trunk/opensaml-soap-impl/src/test/resources/data/org/opensaml/ws/wstrust/
Modified:
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/SOAP11DecoderTest.java
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/SOAP11EncoderTest.java
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/impl/WSSecurityObjectsTestCase.java
    trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java

Modified: trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java?rev=3017&r1=3016&r2=3017&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java (original)
+++ trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java Mon Apr  2 23:04:36 2012
@@ -67,9 +67,9 @@
     protected void setUp() throws Exception {
         super.setUp();
         
-        soapMessage = "/data/org/opensaml/ws/soap/soap11/SOAP.xml";
-        soapFault = "/data/org/opensaml/ws/soap/soap11/SOAPFault.xml";
-        soapFaultMarshall = "/data/org/opensaml/ws/soap/soap11/SOAPFaultMarshall.xml";
+        soapMessage = "/data/org/opensaml/soap/soap11/SOAP.xml";
+        soapFault = "/data/org/opensaml/soap/soap11/SOAPFault.xml";
+        soapFaultMarshall = "/data/org/opensaml/soap/soap11/SOAPFaultMarshall.xml";
         
         expectedFaultCode = new QName(SOAPConstants.SOAP11_NS, "Server", SOAPConstants.SOAP11_PREFIX);
         expectedFaultString = "Server Error";

Modified: trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/SOAP11DecoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/SOAP11DecoderTest.java?rev=3017&r1=3016&r2=3017&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/SOAP11DecoderTest.java (original)
+++ trunk/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/SOAP11DecoderTest.java Mon Apr  2 23:04:36 2012
@@ -67,7 +67,7 @@
      * @throws SecurityException
      */
     public void testBasicNoHeaders() throws MessageDecodingException, SecurityException {
-        String soapMessage = "/data/org/opensaml/ws/soap/soap11/SOAPNoHeaders.xml";
+        String soapMessage = "/data/org/opensaml/soap/soap11/SOAPNoHeaders.xml";
         InputStreamInTransportAdapter inTransport = getInTransportResource(soapMessage);
         
         messageContext.setInboundMessageTransport(inTransport);
@@ -85,7 +85,7 @@
      */
 // TODO disable until mustUnderstand support is complete
 //    public void testNotMustUnderstandHeader() throws SecurityException {
-//        String soapMessage = "/data/org/opensaml/ws/soap/soap11/SOAPHeaderNotMustUnderstand.xml";
+//        String soapMessage = "/data/org/opensaml/soap/soap11/SOAPHeaderNotMustUnderstand.xml";
 //        InputStreamInTransportAdapter inTransport = getInTransportResource(soapMessage);
 //        

[... 96 lines stripped ...]