You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/10/01 13:47:50 UTC

svn commit: r292960 [2/2] - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/deployment/ core/test-resources/deployment/outservice/org/apache/axis/services/ databinding/src/org/apache/axis2/databi...

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultTextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultTextTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultTextTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultTextTest.java Sat Oct  1 04:44:28 2005
@@ -42,7 +42,7 @@
         assertTrue(
                 "SOAP 1.1 Fault Text Test : - After calling setLang method, Lang attribute value mismatch",
                 soap11FaultText.getLang().equals("en"));
-        OMAttribute langAttribute = (OMAttribute) soap11FaultText.getAttributes()
+        OMAttribute langAttribute = (OMAttribute) soap11FaultText.getAllAttributes()
                 .next();
         assertTrue(
                 "SOAP 1.1 Fault Text Test : - After calling setLang method, Lang attribute local name mismaatch",
@@ -94,7 +94,7 @@
         assertTrue(
                 "SOAP 1.2 Fault Text Test : - After calling setLang method, Lang attribute value mismatch",
                 soap12FaultText.getLang().equals("en"));
-        OMAttribute langAttribute = (OMAttribute) soap12FaultText.getAttributes()
+        OMAttribute langAttribute = (OMAttribute) soap12FaultText.getAllAttributes()
                 .next();
         assertTrue(
                 "SOAP 1.2 Fault Text Test : - After calling setLang method, Lang attribute local name mismaatch",
@@ -151,7 +151,7 @@
         assertTrue(
                 "SOAP 1.2 Fault Text Test With Parser : - getLang method returns incorrect string",
                 soap12FaultTextWithParser.getLang().equals("en"));
-        OMAttribute langAttribute = (OMAttribute) soap12FaultTextWithParser.getAttributes()
+        OMAttribute langAttribute = (OMAttribute) soap12FaultTextWithParser.getAllAttributes()
                 .next();
         assertTrue(
                 "SOAP 1.2 Fault Text Test With Parser : - Lang attribute local name mismaatch",

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java Sat Oct  1 04:44:28 2005
@@ -104,13 +104,13 @@
         secondElement.detach();
         assertTrue("OMElement children detachment has not worked properly", !secondElement.equals(firstElement.getFirstElement()));
         assertNull("First Element should not contain elements after detaching. ", firstElement.getFirstElement());
-        assertNull("First Element should not contain elements after detaching. ", firstElement.getFirstChild());
+        assertNull("First Element should not contain elements after detaching. ", firstElement.getFirstOMChild());
         assertNull(secondElement.findNamespace(testNamespace2.getName(), testNamespace2.getPrefix()));
 
         firstElement.addChild(secondElement);
         firstElement.setText("Some Sample Text");
 
-        assertTrue("First added child must be the first child", secondElement.equals(firstElement.getFirstChild()));
+        assertTrue("First added child must be the first child", secondElement.equals(firstElement.getFirstOMChild()));
         Iterator children = firstElement.getChildren();
         int childCount = 0;
         while (children.hasNext()) {
@@ -120,7 +120,7 @@
         assertEquals("Children count should be two", childCount, 2);
 
         secondElement.detach();
-        assertTrue("First child should be the text child", firstElement.getFirstChild() instanceof OMText);
+        assertTrue("First child should be the text child", firstElement.getFirstOMChild() instanceof OMText);
 
 
     }

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java Sat Oct  1 04:44:28 2005
@@ -143,7 +143,7 @@
                             "http://example.org/ts-tests"));
             assertEquals("SOAP 1.2 :- Header block text mismatch",headerBlock.getText().trim(),"foo");
 
-            Iterator headerBlockAttributes = headerBlock.getAttributes();
+            Iterator headerBlockAttributes = headerBlock.getAllAttributes();
             OMAttribute roleAttribute = (OMAttribute) headerBlockAttributes.next();
             assertTrue("SOAP 1.2 :- Role attribute name mismatch",
                     roleAttribute.getLocalName().equals(
@@ -324,7 +324,7 @@
             assertTrue("SOAP 1.2 :- Text value in MaxTime element mismatch",
                     element1.getText().trim().equals("P5M"));
 
-            Iterator attributeIterator = element1.getAttributes();
+            Iterator attributeIterator = element1.getAllAttributes();
             OMAttribute attributeInMaxTime = (OMAttribute) attributeIterator.next();
             assertTrue("SOAP 1.2 :- Attribute local name mismatch",
                     attributeInMaxTime.getLocalName().equals("detail"));
@@ -387,7 +387,7 @@
             assertTrue("SOAP 1.1 :- Headaer block text mismatch",
                     headerBlock.getText().trim().equals("foo"));
 
-            headerBlockAttributes = headerBlock.getAttributes();
+            headerBlockAttributes = headerBlock.getAllAttributes();
 
             mustUnderstandAttribute =
                     (OMAttribute) headerBlockAttributes.next();
@@ -487,7 +487,7 @@
             assertTrue("SOAP 1.1 :- Text value in MaxTime element mismatch",
                     element1.getText().trim().equals("P5M"));
 
-            attributeIterator = element1.getAttributes();
+            attributeIterator = element1.getAllAttributes();
             attributeInMaxTime = (OMAttribute) attributeIterator.next();
             assertTrue("SOAP 1.1 :- Attribute local name mismatch",
                     attributeInMaxTime.getLocalName().equals("detail"));