You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/01/20 23:22:43 UTC

svn commit: r1725823 - /axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java

Author: veithen
Date: Wed Jan 20 22:22:43 2016
New Revision: 1725823

URL: http://svn.apache.org/viewvc?rev=1725823&view=rev
Log:
Fix test case that makes incorrect assumptions about the Axiom API.

Modified:
    axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java

Modified: axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java?rev=1725823&r1=1725822&r2=1725823&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java Wed Jan 20 22:22:43 2016
@@ -42,8 +42,7 @@ import javax.xml.ws.WebServiceException;
 import junit.framework.TestCase;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11HeaderImpl;
+import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axis2.Constants;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.handler.LogicalMessageImpl;
@@ -760,16 +759,16 @@ public class SOAPHeadersAdapterTests ext
         adapter.put(ACOH1_HEADER_QNAME, acoh1ContentList);
         
         // get message object and convert to SOAPEnvelope
-        OMElement omEnvelope = messageContext.getMessage().getAsOMElement();
+        org.apache.axiom.soap.SOAPEnvelope omEnvelope = (org.apache.axiom.soap.SOAPEnvelope)messageContext.getMessage().getAsOMElement();
         
-        // confirm headers are there.  I can cast here only because I know the implementation.  :)
-        SOAP11HeaderImpl omHeader = (SOAP11HeaderImpl)omEnvelope.getChildElements().next();
+        // confirm headers are there.
+        org.apache.axiom.soap.SOAPHeader omHeader = omEnvelope.getHeader();
 
-        Iterator<OMSourcedElementImpl> it = omHeader.getChildElements();
+        Iterator<OMElement> it = omHeader.getChildElements();
         // TODO: not sure if the order of the header additions is or should be preserved.
         // in other words, this test may be a little too strict.
-        OMSourcedElementImpl headerElem1 = it.next();
-        OMSourcedElementImpl headerElem2 = it.next();
+        OMSourcedElement headerElem1 = (OMSourcedElement)it.next();
+        OMSourcedElement headerElem2 = (OMSourcedElement)it.next();
         // should only be two header elements, so...
         assertFalse(it.hasNext());
         
@@ -821,16 +820,16 @@ public class SOAPHeadersAdapterTests ext
         adapter.put(ACOH1_HEADER_QNAME, acoh1ContentList);
         
         // get message object and convert to SOAPEnvelope
-        OMElement omEnvelope = messageContext.getMessage().getAsOMElement();
+        org.apache.axiom.soap.SOAPEnvelope omEnvelope = (org.apache.axiom.soap.SOAPEnvelope)messageContext.getMessage().getAsOMElement();
         
-        // confirm headers are there.  I can cast here only because I know the implementation.  :)
-        SOAP11HeaderImpl omHeader = (SOAP11HeaderImpl)omEnvelope.getChildElements().next();
+        // confirm headers are there.
+        org.apache.axiom.soap.SOAPHeader omHeader = omEnvelope.getHeader();
 
-        Iterator<OMSourcedElementImpl> it = omHeader.getChildElements();
+        Iterator<OMElement> it = omHeader.getChildElements();
         // TODO: not sure if the order of the header additions is or should be preserved.
         // in other words, this test may be a little too strict.
-        OMSourcedElementImpl headerElem1 = it.next();
-        OMSourcedElementImpl headerElem2 = it.next();
+        OMSourcedElement headerElem1 = (OMSourcedElement)it.next();
+        OMSourcedElement headerElem2 = (OMSourcedElement)it.next();
         // should only be two header elements, so...
         assertFalse(it.hasNext());
         
@@ -890,16 +889,16 @@ public class SOAPHeadersAdapterTests ext
         payload.toString();
         
         // get message object and convert to SOAPEnvelope
-        OMElement omEnvelope = messageContext.getMessage().getAsOMElement();
+        org.apache.axiom.soap.SOAPEnvelope omEnvelope = (org.apache.axiom.soap.SOAPEnvelope)messageContext.getMessage().getAsOMElement();
         
-        // confirm headers are there.  I can cast here only because I know the implementation.  :)
-        SOAP11HeaderImpl omHeader = (SOAP11HeaderImpl)omEnvelope.getChildElements().next();
+        // confirm headers are there.
+        org.apache.axiom.soap.SOAPHeader omHeader = omEnvelope.getHeader();
 
-        Iterator<OMSourcedElementImpl> it = omHeader.getChildElements();
+        Iterator<OMElement> it = omHeader.getChildElements();
         // TODO: not sure if the order of the header additions is or should be preserved.
         // in other words, this test may be a little too strict.
-        OMSourcedElementImpl headerElem1 = it.next();
-        OMSourcedElementImpl headerElem2 = it.next();
+        OMSourcedElement headerElem1 = (OMSourcedElement)it.next();
+        OMSourcedElement headerElem2 = (OMSourcedElement)it.next();
         // should only be two header elements, so...
         assertFalse(it.hasNext());