You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/07/26 08:11:03 UTC
svn commit: r425639 [2/2] - in /webservices/commons/trunk/modules/axiom:
src/org/apache/axiom/om/ src/org/apache/axiom/om/impl/dom/
src/org/apache/axiom/om/impl/llom/ src/org/apache/axiom/om/impl/llom/util/
src/org/apache/axiom/om/impl/util/ src/org/ap...
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultDetailTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultDetailTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultDetailTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultDetailTest.java Tue Jul 25 23:11:01 2006
@@ -59,7 +59,7 @@
detailEntry1.getLocalName().equals("DetailEntry1"));
assertTrue(
"SOAP 1.1 Fault Detail Test : - detailEntry1 namespace uri mismatch",
- detailEntry1.getNamespace().getName().equals(
+ detailEntry1.getNamespace().getNamespaceURI().equals(
"http://www.test.org"));
OMElement detailEntry2 = (OMElement) iterator.next();
assertFalse(
@@ -94,7 +94,7 @@
detailEntry.getLocalName().equals("DetailEntry"));
assertTrue(
"SOAP 1.1 Fault Detail Test : - detailEntry namespace uri mismatch",
- detailEntry.getNamespace().getName().equals(
+ detailEntry.getNamespace().getNamespaceURI().equals(
"http://www.test.org"));
assertTrue(
"SOAP 1.1 Fault Detail Test : - After calling addDetailEntry method once, getAllDetailEntries method returns an iterator with two objects",
@@ -117,7 +117,7 @@
detailEntry1.getLocalName().equals("DetailEntry1"));
assertTrue(
"SOAP 1.2 Fault Detail Test : - detailEntry1 namespace uri mismatch",
- detailEntry1.getNamespace().getName().equals(
+ detailEntry1.getNamespace().getNamespaceURI().equals(
"http://www.test.org"));
OMElement detailEntry2 = (OMElement) iterator.next();
assertFalse(
@@ -128,7 +128,7 @@
detailEntry2.getLocalName().equals("DetailEntry2"));
assertTrue(
"SOAP 1.2 Fault Detail Test : - detailEntry2 namespace uri mismatch",
- detailEntry2.getNamespace().getName().equals(
+ detailEntry2.getNamespace().getNamespaceURI().equals(
"http://www.test.org"));
assertTrue(
"SOAP 1.2 Fault Detail Test : - After calling addDetailEntry method twice, getAllDetailEntries method returns an iterator with three objects",
@@ -152,7 +152,7 @@
detailEntry.getLocalName().equals("DetailEntry"));
assertTrue(
"SOAP 1.2 Fault Detail Test : - detailEntry namespace uri mismatch",
- detailEntry.getNamespace().getName().equals(
+ detailEntry.getNamespace().getNamespaceURI().equals(
"http://www.test.org"));
assertTrue(
"SOAP 1.2 Fault Detail Test : - After calling addDetailEntry method once, getAllDetailEntries method returns an iterator with two objects",
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultTextTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultTextTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultTextTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultTextTest.java Tue Jul 25 23:11:01 2006
@@ -54,7 +54,7 @@
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
assertTrue(
"SOAP 1.1 Fault Text Test : - After calling setLang method, Lang attribute namespace uri mismatch",
- langAttribute.getNamespace().getName().equals(
+ langAttribute.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI));
}
@@ -106,7 +106,7 @@
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
assertTrue(
"SOAP 1.2 Fault Text Test : - After calling setLang method, Lang attribute namespace uri mismatch",
- langAttribute.getNamespace().getName().equals(
+ langAttribute.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI));
}
@@ -163,7 +163,7 @@
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
assertTrue(
"SOAP 1.2 Fault Text Test With Parser : - Lang attribute namespace uri mismatch",
- langAttribute.getNamespace().getName().equals(
+ langAttribute.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI));
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPHeaderTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPHeaderTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPHeaderTest.java Tue Jul 25 23:11:01 2006
@@ -43,7 +43,7 @@
headerBlock1.getLocalName().equals("echoOk1"));
assertTrue(
"SOAP 1.1 Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getName().equals(
+ headerBlock1.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
SOAPHeaderBlock headerBlock2 = (SOAPHeaderBlock) iterator.next();
@@ -54,7 +54,7 @@
headerBlock2.getLocalName().equals("echoOk2"));
assertTrue(
"SOAP 1.1 Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getName().equals(
+ headerBlock2.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
assertTrue(
@@ -104,7 +104,7 @@
headerBlock1.getLocalName().equals("echoOk1"));
assertTrue(
"SOAP 1.1 Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getName().equals(
+ headerBlock1.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
iterator.hasNext();
@@ -116,7 +116,7 @@
headerBlock2.getLocalName().equals("echoOk2"));
assertTrue(
"SOAP 1.1 Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getName().equals(
+ headerBlock2.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
assertFalse(
@@ -141,7 +141,7 @@
arrayList.size() == 1);
assertTrue(
"SOAP 1.1 Header Test : - headerBlock of given namespace uri mismatch",
- ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getName()
+ ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getNamespaceURI()
.equals("http://www.test1.org"));
}
@@ -158,7 +158,7 @@
headerBlock1.getLocalName().equals("echoOk1"));
assertTrue(
"SOAP 1.2 Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getName().equals(
+ headerBlock1.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
SOAPHeaderBlock headerBlock2 = (SOAPHeaderBlock) iterator.next();
@@ -169,7 +169,7 @@
headerBlock2.getLocalName().equals("echoOk2"));
assertTrue(
"SOAP 1.2 Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getName().equals(
+ headerBlock2.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
assertTrue(
@@ -243,7 +243,7 @@
headerBlock1.getLocalName().equals("echoOk1"));
assertTrue(
"SOAP 1.2 Header Test : - HeaderBlock1 namespace uri mismatch",
- headerBlock1.getNamespace().getName().equals(
+ headerBlock1.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
SOAPHeaderBlock headerBlock2 = (SOAPHeaderBlock) iterator.next();
@@ -254,7 +254,7 @@
headerBlock2.getLocalName().equals("echoOk2"));
assertTrue(
"SOAP 1.2 Header Test : - HeaderBlock2 namespace uri mismatch",
- headerBlock2.getNamespace().getName().equals(
+ headerBlock2.getNamespace().getNamespaceURI().equals(
"http://www.example.org"));
assertFalse(
@@ -276,7 +276,7 @@
arrayList.size() == 1);
assertTrue(
"SOAP 1.2 Header Test : - headerBlock of given namespace uri, mismatch",
- ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getName()
+ ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getNamespaceURI()
.equals("http://www.test1.org"));
}
@@ -362,7 +362,7 @@
"MessageID"));
assertTrue(
"SOAP 1.1 Header Test With Parser : - headerBlock of given namespace uri, mismatch",
- ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getName()
+ ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getNamespaceURI()
.equals("http://example.org/ts-tests"));
}
@@ -459,7 +459,7 @@
"echoOk"));
assertTrue(
"SOAP 1.2 Header Test With Parser : - headerBlock of given namespace uri, mismatch",
- ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getName()
+ ((SOAPHeaderBlock) arrayList.get(0)).getNamespace().getNamespaceURI()
.equals("http://example.org/ts-tests"));
}
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilderTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilderTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilderTest.java Tue Jul 25 23:11:01 2006
@@ -19,8 +19,6 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPBody;
@@ -37,6 +35,8 @@
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -152,7 +152,7 @@
soap12Envelope.getLocalName().equals(
SOAPConstants.SOAPENVELOPE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- envelope namespace uri mismatch",
- soap12Envelope.getNamespace().getName().equals(
+ soap12Envelope.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
SOAPHeader header = soap12Envelope.getHeader();
@@ -160,14 +160,14 @@
header.getLocalName().equals(
SOAPConstants.HEADER_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Header namespace uri mismatch",
- header.getNamespace().getName().equals(
+ header.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
SOAPHeaderBlock headerBlock = (SOAPHeaderBlock) header.getFirstElement();
assertTrue("SOAP 1.2 :- Header block name mismatch",
headerBlock.getLocalName().equals("echoOk"));
assertTrue("SOAP 1.2 :- Header block name space uri mismatch",
- headerBlock.getNamespace().getName().equals(
+ headerBlock.getNamespace().getNamespaceURI().equals(
"http://example.org/ts-tests"));
assertEquals("SOAP 1.2 :- Header block text mismatch", headerBlock.getText().trim(), "foo");
@@ -203,7 +203,7 @@
assertTrue("SOAP 1.2 :- Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Body namespace uri mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
SOAPFault fault = body.getFault();
@@ -211,7 +211,7 @@
fault.getLocalName().equals(
SOAPConstants.SOAPFAULT_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault namespace uri mismatch",
- fault.getNamespace().getName().equals(
+ fault.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
Iterator iteratorInFault = fault.getChildren();
@@ -222,7 +222,7 @@
code.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault code namespace uri mismatch",
- code.getNamespace().getName().equals(
+ code.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
Iterator iteratorInCode = code.getChildren();
@@ -233,7 +233,7 @@
value1.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault code namespace uri mismatch",
- value1.getNamespace().getName().equals(
+ value1.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Value1 text mismatch",
value1.getText().equals("env:Sender"));
@@ -244,7 +244,7 @@
subCode1.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault subcode namespace uri mismatch",
- subCode1.getNamespace().getName().equals(
+ subCode1.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
Iterator iteratorInSubCode1 = subCode1.getChildren();
@@ -255,7 +255,7 @@
value2.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault code namespace uri mismatch",
- value2.getNamespace().getName().equals(
+ value2.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Value2 text mismatch",
value2.getText().equals("m:MessageTimeout"));
@@ -266,7 +266,7 @@
subCode2.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault subcode namespace uri mismatch",
- subCode2.getNamespace().getName().equals(
+ subCode2.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
Iterator iteratorInSubCode2 = subCode2.getChildren();
@@ -277,7 +277,7 @@
value3.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault code namespace uri mismatch",
- value3.getNamespace().getName().equals(
+ value3.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Value2 text mismatch",
value3.getText().equals("m:MessageTimeout"));
@@ -288,7 +288,7 @@
reason.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault reason namespace uri mismatch",
- reason.getNamespace().getName().equals(
+ reason.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
Iterator iteratorInReason = reason.getChildren();
@@ -299,7 +299,7 @@
text.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Text namespace uri mismatch",
- text.getNamespace().getName().equals(
+ text.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Text value mismatch",
text.getText().equals("Sender Timeout"));
@@ -310,7 +310,7 @@
node.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault node namespace uri mismatch",
- node.getNamespace().getName().equals(
+ node.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Node value mismatch",
node.getText().trim().equals(
@@ -322,7 +322,7 @@
role.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault role namespace uri mismatch",
- role.getNamespace().getName().equals(
+ role.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Role value mismatch",
role.getText().trim().equals("ultimateReceiver"));
@@ -333,7 +333,7 @@
detail.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME));
assertTrue("SOAP 1.2 :- Fault detail namespace uri mismatch",
- detail.getNamespace().getName().equals(
+ detail.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.2 :- Text in detail mismatch",
@@ -346,7 +346,7 @@
assertTrue("SOAP 1.2 :- MaxTime element mismatch",
element1.getLocalName().equals("MaxTime"));
assertTrue("SOAP 1.2 :- MaxTime element namespace mismatch",
- element1.getNamespace().getName().equals(
+ element1.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.2 :- Text value in MaxTime element mismatch",
element1.getText().trim().equals("P5M"));
@@ -356,7 +356,7 @@
assertTrue("SOAP 1.2 :- Attribute local name mismatch",
attributeInMaxTime.getLocalName().equals("detail"));
assertTrue("SOAP 1.2 :- Attribute namespace mismatch",
- attributeInMaxTime.getNamespace().getName().equals(
+ attributeInMaxTime.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.2 :- Attribute value mismatch",
attributeInMaxTime.getAttributeValue().trim().equals("This is only a test"));
@@ -366,7 +366,7 @@
assertTrue("SOAP 1.2 :- AveTime element mismatch",
element2.getLocalName().equals("AveTime"));
assertTrue("SOAP 1.2 :- AveTime element namespace mismatch",
- element2.getNamespace().getName().equals(
+ element2.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
Iterator iteratorInAveTimeElement = element2.getChildren();
@@ -376,7 +376,7 @@
assertTrue("SOAP 1.2 :- Time element mismatch",
element21.getLocalName().equals("Time"));
assertTrue("SOAP 1.2 :- Time element namespace mismatch",
- element21.getNamespace().getName().equals(
+ element21.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.2 :- Text value in Time element mismatch",
element21.getText().trim().equals("P3M"));
@@ -394,7 +394,7 @@
soap11Envelope.getLocalName().equals(
SOAPConstants.SOAPENVELOPE_LOCAL_NAME));
assertTrue("SOAP 1.1 :- envelope namespace uri mismatch",
- soap11Envelope.getNamespace().getName().equals(
+ soap11Envelope.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
header = soap11Envelope.getHeader();
@@ -409,7 +409,7 @@
assertTrue("SOAP 1.1 :- Header block name mismatch",
headerBlock.getLocalName().equals("echoOk"));
assertTrue("SOAP 1.1 :- Header block name space uri mismatch",
- headerBlock.getNamespace().getName().equals(
+ headerBlock.getNamespace().getNamespaceURI().equals(
"http://example.org/ts-tests"));
assertTrue("SOAP 1.1 :- Headaer block text mismatch",
headerBlock.getText().trim().equals("foo"));
@@ -429,7 +429,7 @@
SOAPConstants.ATTR_MUSTUNDERSTAND_1));
assertTrue(
"SOAP 1.1 :- Mustunderstand attribute namespace uri mismatch",
- mustUnderstandAttribute.getNamespace().getName().equals(
+ mustUnderstandAttribute.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
assertTrue("SOAP 1.1 :- Actor attribute name not found",
@@ -441,19 +441,19 @@
"/" +
"next"));
assertTrue("SOAP 1.1 :- Actor attribute namespace uri mismatch",
- actorAttribute.getNamespace().getName().equals(
+ actorAttribute.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
body = soap11Envelope.getBody();
assertTrue("SOAP 1.1 :- Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.1 :- Body namespace uri mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
fault = body.getFault();
assertTrue("SOAP 1.1 :- Fault namespace uri mismatch",
- fault.getNamespace().getName().equals(
+ fault.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
iteratorInFault = fault.getChildren();
@@ -507,7 +507,7 @@
assertTrue("SOAP 1.1 :- MaxTime element mismatch",
element1.getLocalName().equals("MaxTime"));
assertTrue("SOAP 1.1 :- MaxTime element namespace mismatch",
- element1.getNamespace().getName().equals(
+ element1.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.1 :- Text value in MaxTime element mismatch",
element1.getText().trim().equals("P5M"));
@@ -517,7 +517,7 @@
assertTrue("SOAP 1.1 :- Attribute local name mismatch",
attributeInMaxTime.getLocalName().equals("detail"));
assertTrue("SOAP 1.1 :- Attribute namespace mismatch",
- attributeInMaxTime.getNamespace().getName().equals(
+ attributeInMaxTime.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.1 :- Attribute value mismatch",
attributeInMaxTime.getAttributeValue().equals("This is only a test"));
@@ -527,7 +527,7 @@
assertTrue("SOAP 1.1 :- AveTime element mismatch",
element2.getLocalName().equals("AveTime"));
assertTrue("SOAP 1.1 :- AveTime element namespace mismatch",
- element2.getNamespace().getName().equals(
+ element2.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
iteratorInAveTimeElement = element2.getChildren();
@@ -537,7 +537,7 @@
assertTrue("SOAP 1.1 :- Time element mismatch",
element21.getLocalName().equals("Time"));
assertTrue("SOAP 1.1 :- Time element namespace mismatch",
- element21.getNamespace().getName().equals(
+ element21.getNamespace().getNamespaceURI().equals(
"http:www.sample.org"));
assertTrue("SOAP 1.1 :- Text value in Time element mismatch",
element21.getText().trim().equals("P3M"));
@@ -547,14 +547,14 @@
assertTrue("SOAP 1.1 :- Test element mismatch",
testElement.getLocalName().equals("Test"));
assertTrue("SOAP 1.1 :- Test element namespace mismatch",
- testElement.getNamespace().getName().equals(
+ testElement.getNamespace().getNamespaceURI().equals(
"http:www.Test.org"));
OMElement childOfTestElement = testElement.getFirstElement();
assertTrue("SOAP 1.1 :- Test element child local name mismatch",
childOfTestElement.getLocalName().equals("TestElement"));
assertTrue("SOAP 1.1 :- Test element child namespace mismatch",
- childOfTestElement.getNamespace().getName().equals(
+ childOfTestElement.getNamespace().getNamespaceURI().equals(
"http:www.Test.org"));
assertTrue("SOAP 1.1 :- Test element child value mismatch",
childOfTestElement.getText().trim().equals("This is only a test"));
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/llom/OMElementTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/llom/OMElementTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/llom/OMElementTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/llom/OMElementTest.java Tue Jul 25 23:11:01 2006
@@ -23,10 +23,10 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMTestCase;
import org.apache.axiom.om.OMText;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -89,10 +89,10 @@
OMNamespace testNamespace2 = factory.createOMNamespace("ftp://anotherTest.ws.org", "ws");
firstElement.declareNamespace(testNamespace2);
- OMNamespace inheritedSecondNamespace = secondElement.findNamespace(testNamespace2.getName(),
+ OMNamespace inheritedSecondNamespace = secondElement.findNamespace(testNamespace2.getNamespaceURI(),
testNamespace2.getPrefix());
assertNotNull("Children should inherit namespaces declared in parent", inheritedSecondNamespace);
- assertEquals("inherited namespace uri should be equal", inheritedSecondNamespace.getName(), testNamespace2.getName());
+ assertEquals("inherited namespace uri should be equal", inheritedSecondNamespace.getNamespaceURI(), testNamespace2.getNamespaceURI());
assertEquals("inherited namespace prefix should be equal", inheritedSecondNamespace.getPrefix(), testNamespace2.getPrefix());
@@ -105,7 +105,7 @@
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.getFirstOMChild());
- assertNull(secondElement.findNamespace(testNamespace2.getName(), testNamespace2.getPrefix()));
+ assertNull(secondElement.findNamespace(testNamespace2.getNamespaceURI(), testNamespace2.getPrefix()));
firstElement.addChild(secondElement);
firstElement.setText("Some Sample Text");
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org