You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by hu...@apache.org on 2006/07/31 14:39:49 UTC
svn commit: r427102 - in /incubator/woden/branches/WODEN-40:
src/org/apache/woden/internal/ src/org/apache/woden/internal/wsdl20/
src/org/apache/woden/wsdl20/xml/
test/org/apache/woden/internal/wsdl20/validation/
test/org/apache/woden/wsdl20/xml/
Author: hughesj
Date: Mon Jul 31 05:39:48 2006
New Revision: 427102
URL: http://svn.apache.org/viewvc?rev=427102&view=rev
Log:
Moved DescriptionElement.createInterfaceFaultElement to InterfaceElement.addInterfaceFaultElement. Updated tests
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java Mon Jul 31 05:39:48 2006
@@ -788,7 +788,7 @@
}
else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
{
- intface.addInterfaceFaultElement(parseInterfaceFault(tempEl, desc, intface));
+ parseInterfaceFault(tempEl, desc, intface);
}
else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
{
@@ -824,10 +824,10 @@
private InterfaceFaultElement parseInterfaceFault(
Element faultEl,
DescriptionElement desc,
- WSDLElement parent)
+ InterfaceElement parent)
throws WSDLException
{
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = parent.addInterfaceFaultElement();
fault.setParentElement(parent);
String name = DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java Mon Jul 31 05:39:48 2006
@@ -702,7 +702,7 @@
intface.addDocumentationElement(parseDocumentation(interfaceChild, desc));
}
else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, interfaceChild)){
- intface.addInterfaceFaultElement(parseInterfaceFault(interfaceChild, desc, intface));
+ parseInterfaceFault(interfaceChild, desc, intface);
}
else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, interfaceChild)){
intface.addInterfaceOperationElement(parseInterfaceOperation(interfaceChild, desc, intface));
@@ -943,10 +943,10 @@
private InterfaceFaultElement parseInterfaceFault(
OMElement faultEl,
DescriptionElement desc,
- WSDLElement parent)
+ InterfaceElement parent)
throws WSDLException{
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = parent.addInterfaceFaultElement();
fault.setParentElement(parent);
String name = OMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java Mon Jul 31 05:39:48 2006
@@ -503,10 +503,6 @@
return intface;
}
- public InterfaceFaultElement createInterfaceFaultElement() {
- return new InterfaceFaultImpl();
- }
-
public InterfaceOperationElement createInterfaceOperationElement() {
return new InterfaceOperationImpl();
}
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java Mon Jul 31 05:39:48 2006
@@ -300,14 +300,14 @@
}
/*
- * @see org.apache.woden.wsdl20.xml.InterfaceElement#addInterfaceFaultElement(org.apache.woden.wsdl20.xml.InterfaceFaultElement)
+ * @see org.apache.woden.wsdl20.xml.InterfaceElement#addInterfaceFaultElement()
*/
- public void addInterfaceFaultElement(InterfaceFaultElement fault)
+ public InterfaceFaultElement addInterfaceFaultElement()
{
- if(fault != null) {
- fInterfaceFaultElements.add(fault);
- fault.setParentElement(this);
- }
+ InterfaceFaultElement fault = new InterfaceFaultImpl();
+ fInterfaceFaultElements.add(fault);
+ fault.setParentElement(this);
+ return fault;
}
/*
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.java Mon Jul 31 05:39:48 2006
@@ -89,8 +89,6 @@
*/
public InterfaceElement createInterfaceElement();
- public InterfaceFaultElement createInterfaceFaultElement();
-
public InterfaceOperationElement createInterfaceOperationElement();
public InterfaceFaultReferenceElement createInterfaceFaultReferenceElement();
Modified: incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/InterfaceElement.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/InterfaceElement.java (original)
+++ incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/InterfaceElement.java Mon Jul 31 05:39:48 2006
@@ -55,7 +55,7 @@
* Elements
*/
- public void addInterfaceFaultElement(InterfaceFaultElement fault);
+ public InterfaceFaultElement addInterfaceFaultElement();
//TODO public void removeInterfaceFaultElement(QName qname);
/**
Modified: incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java (original)
+++ incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java Mon Jul 31 05:39:48 2006
@@ -602,10 +602,9 @@
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = ie.addInterfaceFaultElement();
interfaceFault.setName(name1);
- if(!val.testAssertionInterfaceFault0032(new InterfaceFault[]{interfaceFault}, reporter))
+ if(!val.testAssertionInterfaceFault0032(new InterfaceFault[]{(InterfaceFaultImpl)interfaceFault}, reporter))
{
fail("The testAssertionInterfaceFault0032 method returned false for an interface fault that is the only interface fault defined.");
}
@@ -621,17 +620,14 @@
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = ie.addInterfaceFaultElement();
interfaceFault.setName(name1);
- InterfaceFaultImpl interfaceFault2 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault2);
+ InterfaceFaultElement interfaceFault2 = ie.addInterfaceFaultElement();
interfaceFault2.setName(name2);
- InterfaceFaultImpl interfaceFault3 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault3);
+ InterfaceFaultElement interfaceFault3 = ie.addInterfaceFaultElement();
interfaceFault3.setName(name3);
- InterfaceFault[] interfaceFaults = new InterfaceFault[]{interfaceFault, interfaceFault2, interfaceFault3};
+ InterfaceFault[] interfaceFaults = new InterfaceFault[]{(InterfaceFaultImpl)interfaceFault, (InterfaceFaultImpl)interfaceFault2, (InterfaceFaultImpl)interfaceFault3};
if(!val.testAssertionInterfaceFault0032(interfaceFaults, reporter))
{
@@ -649,17 +645,14 @@
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault);
- interfaceFault.setName(name1);
- InterfaceFaultImpl interfaceFault2 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault2);
- interfaceFault2.setName(name2);
- InterfaceFaultImpl interfaceFault3 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault3);
- interfaceFault3.setName(name1);
-
- InterfaceFault[] interfaceFaults = new InterfaceFault[]{interfaceFault, interfaceFault2, interfaceFault3};
+ InterfaceFaultElement interfaceFault = ie.addInterfaceFaultElement();
+ interfaceFault.setName(name1);
+ InterfaceFaultElement interfaceFault2 = ie.addInterfaceFaultElement();
+ interfaceFault2.setName(name2);
+ InterfaceFaultElement interfaceFault3 = ie.addInterfaceFaultElement();
+ interfaceFault3.setName(name1);
+
+ InterfaceFault[] interfaceFaults = new InterfaceFault[]{(InterfaceFaultImpl)interfaceFault, (InterfaceFaultImpl)interfaceFault2, (InterfaceFaultImpl)interfaceFault3};
if(val.testAssertionInterfaceFault0032(interfaceFaults, reporter))
{
@@ -678,17 +671,14 @@
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault);
- interfaceFault.setName(name1);
- InterfaceFaultImpl interfaceFault2 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault2);
- interfaceFault2.setName(name2);
- InterfaceFaultImpl interfaceFault3 = new InterfaceFaultImpl();
- ie.addInterfaceFaultElement(interfaceFault3);
+ InterfaceFaultElement interfaceFault = ie.addInterfaceFaultElement();
+ interfaceFault.setName(name1);
+ InterfaceFaultElement interfaceFault2 = ie.addInterfaceFaultElement();
+ interfaceFault2.setName(name2);
+ InterfaceFaultElement interfaceFault3 = ie.addInterfaceFaultElement();
interfaceFault3.setName(new NCName("name1"));
- InterfaceFault[] interfaceFaults = new InterfaceFault[]{interfaceFault, interfaceFault2, interfaceFault3};
+ InterfaceFault[] interfaceFaults = new InterfaceFault[]{(InterfaceFaultImpl)interfaceFault, (InterfaceFaultImpl)interfaceFault2, (InterfaceFaultImpl)interfaceFault3};
if(val.testAssertionInterfaceFault0032(interfaceFaults, reporter))
{
@@ -714,10 +704,9 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(new NCName("interfacename"));
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault);
- interfaceFault.setName(new NCName("interfaceoperation"));
- if(!val.testAssertionInterfaceFault0028(interfaceFault, interfac, reporter))
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
+ interfaceFault.setName(new NCName("interfaceoperation"));
+ if(!val.testAssertionInterfaceFault0028((InterfaceFaultImpl)interfaceFault, interfac, reporter))
{
fail("The testAssertionInterfaceFault0028 method returned false for an interface fault with the same namespace as the containing interface.");
}
@@ -1031,9 +1020,8 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1060,12 +1048,10 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
- InterfaceFaultElement fault2 = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault2 = interfac.addInterfaceFaultElement();
fault2.setName(name2);
- interfac.addInterfaceFaultElement(fault2);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1096,9 +1082,8 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1129,12 +1114,10 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
- InterfaceFaultElement fault2 = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault2 = interfac.addInterfaceFaultElement();
fault2.setName(name2);
- interfac.addInterfaceFaultElement(fault2);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1166,8 +1149,7 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
- interfac.addInterfaceFaultElement(fault);
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1199,9 +1181,8 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1254,9 +1235,8 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- InterfaceFaultElement fault = desc.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfac.addInterfaceFaultElement();
fault.setName(name1);
- interfac.addInterfaceFaultElement(fault);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -2617,7 +2597,7 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name3);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name4);
@@ -2634,7 +2614,6 @@
bindingFaultReference.setMessageLabel(MessageLabel.IN);
bindingFaultReference.setRef(name3QN);
- interfac.addInterfaceFaultElement(interfaceFault);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
if(!val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(), reporter))
@@ -2655,7 +2634,7 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name3);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name4);
@@ -2677,7 +2656,6 @@
bindingFaultReference2.setMessageLabel(MessageLabel.OUT);
bindingFaultReference2.setRef(name3QN);
- interfac.addInterfaceFaultElement(interfaceFault);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference2);
@@ -2700,7 +2678,7 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name3);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name4);
@@ -2719,7 +2697,6 @@
bindingFaultReference2.setMessageLabel(MessageLabel.IN);
bindingFaultReference2.setRef(name3QN);
- interfac.addInterfaceFaultElement(interfaceFault);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
if(val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(), reporter))
@@ -2748,8 +2725,7 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name2);
InterfaceOperationImpl interfaceOper = new InterfaceOperationImpl();
interfac.addInterfaceOperationElement(interfaceOper);
@@ -2824,8 +2800,7 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name2);
BindingElement binding = desc.createBindingElement();
@@ -2852,14 +2827,11 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name1);
- InterfaceFaultImpl interfaceFault2 = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault2);
+ InterfaceFaultElement interfaceFault2 = interfac.addInterfaceFaultElement();
interfaceFault2.setName(name2);
- InterfaceFaultImpl interfaceFault3 = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault3);
+ InterfaceFaultElement interfaceFault3 = interfac.addInterfaceFaultElement();
interfaceFault.setName(name3);
BindingElement binding = desc.createBindingElement();
@@ -2892,11 +2864,9 @@
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault);
+ InterfaceFaultElement interfaceFault = interfac.addInterfaceFaultElement();
interfaceFault.setName(name1);
- InterfaceFaultImpl interfaceFault2 = new InterfaceFaultImpl();
- interfac.addInterfaceFaultElement(interfaceFault2);
+ InterfaceFaultElement interfaceFault2 = interfac.addInterfaceFaultElement();
interfaceFault2.setName(name2);
BindingElement binding = desc.createBindingElement();
Modified: incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java (original)
+++ incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java Mon Jul 31 05:39:48 2006
@@ -1277,9 +1277,8 @@
TypesElement types = descElem.getTypesElement();
types.addSchema(schema);
InterfaceElement interfaceElem = descElem.createInterfaceElement();
- InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfaceElem.addInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myElement"));
- interfaceElem.addInterfaceFaultElement(fault);
if(!val.testAssertionSchema0020b(descElem, fault, reporter))
{
@@ -1301,9 +1300,8 @@
TypesElement types = descElem.getTypesElement();
types.addSchema(schema);
InterfaceElement interfaceElem = descElem.createInterfaceElement();
- InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfaceElem.addInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myElement2"));
- interfaceElem.addInterfaceFaultElement(fault);
if(!val.testAssertionSchema0020b(descElem, fault, reporter))
{
@@ -1324,9 +1322,8 @@
TypesElement types = descElem.getTypesElement();
types.addSchema(schema);
InterfaceElement interfaceElem = descElem.createInterfaceElement();
- InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
+ InterfaceFaultElement fault = interfaceElem.addInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myType"));
- interfaceElem.addInterfaceFaultElement(fault);
if(val.testAssertionSchema0020b(descElem, fault, reporter))
{
Modified: incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java?rev=427102&r1=427101&r2=427102&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java (original)
+++ incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java Mon Jul 31 05:39:48 2006
@@ -33,6 +33,8 @@
return new TestSuite(ChildElementCreationTest.class);
}
+
+ // Elements addable to Binding
public void testBindingFaultElement() {
DescriptionElement descEl = new DescriptionImpl();
BindingElement bindEl = descEl.createBindingElement();
@@ -77,4 +79,16 @@
assertTrue("BindingOperationElement has incorrect parent", bindOpEl.getParentElement() == bindEl);
}
+ // Elements addable to Interface
+ public void testInterfaceFaultElement() {
+ DescriptionElement descEl = new DescriptionImpl();
+ InterfaceElement interfaceEl = descEl.createInterfaceElement();
+
+ InterfaceFaultElement interfaceFEl = interfaceEl.addInterfaceFaultElement();
+
+ assertTrue("InterfaceElement doesn't have correct InterfaceFaultElement",
+ Arrays.asList(interfaceEl.getInterfaceFaultElements()).contains(interfaceFEl));
+ assertTrue("InterfaceFaultElement has incorrect parent", interfaceFEl.getParentElement() == interfaceEl);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org