Author: hughesj
Date: Thu Jul 27 04:08:25 2006
New Revision: 426030
URL: http://svn.apache.org/viewvc?rev=426030&view=rev
Log:
This is what I have so far of impl for WODEN-40 item #2.
addBindingFaultElement and addBindingOperationElement are now on BindingElement
interface. Testcases updated accordingly.
New test case ChildElementCreationTest added to test these changes specifically.
DOM/OMWSDLReader changed to use the new method.
BTW: I decided to use add instead of create methods as add/remove is better
than create/remove or create/destroy IMO
Added:
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
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/BindingImpl.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/BindingElement.java
incubator/woden/branches/WODEN-40/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
incubator/woden/branches/WODEN-40/test/org/apache/woden/tests/W3CFileRepository.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=426030&r1=426029&r2=426030&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
Thu Jul 27 04:08:25 2006
@@ -1197,11 +1197,11 @@
}
else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
{
- binding.addBindingFaultElement(parseBindingFault(tempEl, desc,
binding));
+ parseBindingFault(tempEl, desc, binding);
}
else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
{
-
binding.addBindingOperationElement(parseBindingOperation(tempEl, desc,
binding));
+ parseBindingOperation(tempEl, desc, binding);
}
else if (QNameUtils.matches(Constants.Q_ELEM_FEATURE, tempEl))
{
@@ -1225,10 +1225,10 @@
private BindingFaultElement parseBindingFault(Element bindFaultEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingElement parent)
throws WSDLException
{
- BindingFaultElement fault = desc.createBindingFaultElement();
+ BindingFaultElement fault = parent.addBindingFaultElement();
fault.setParentElement(parent);
QName intFltQN = null;
@@ -1287,10 +1287,10 @@
private BindingOperationElement parseBindingOperation(
Element bindOpEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingElement parent)
throws WSDLException
{
- BindingOperationElement oper = desc.createBindingOperationElement();
+ BindingOperationElement oper = parent.addBindingOperationElement();
oper.setParentElement(parent);
QName refQN = null;
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=426030&r1=426029&r2=426030&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
Thu Jul 27 04:08:25 2006
@@ -413,10 +413,10 @@
binding.addDocumentationElement(parseDocumentation(bindElChild, desc));
}
else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, bindElChild)){
- binding.addBindingFaultElement(parseBindingFault(bindElChild,
desc, binding));
+ parseBindingFault(bindElChild, desc, binding);
}
else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION,
bindElChild)){
-
binding.addBindingOperationElement(parseBindingOperation(bindElChild, desc,
binding));
+ parseBindingOperation(bindElChild, desc, binding);
}
else if (QNameUtils.matches(Constants.Q_ELEM_FEATURE,
bindElChild)){
binding.addFeatureElement(parseFeature(bindElChild, desc,
binding));
@@ -434,10 +434,10 @@
private BindingOperationElement parseBindingOperation(OMElement bindOpEl,
DescriptionElement
desc,
- WSDLElement parent)
+ BindingElement
parent)
throws WSDLException{
- BindingOperationElement oper = desc.createBindingOperationElement();
+ BindingOperationElement oper = parent.addBindingOperationElement();
oper.setParentElement(parent);
QName refQN = null;
@@ -618,10 +618,10 @@
private BindingFaultElement parseBindingFault(OMElement bindFaultEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingElement parent)
throws WSDLException{
- BindingFaultElement fault = desc.createBindingFaultElement();
+ BindingFaultElement fault = parent.addBindingFaultElement();
fault.setParentElement(parent);
QName intFltQN = null;
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/BindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/BindingImpl.java?rev=426030&r1=426029&r2=426030&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/BindingImpl.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/BindingImpl.java
Thu Jul 27 04:08:25 2006
@@ -172,14 +172,14 @@
}
/*
- * @see
org.apache.woden.wsdl20.xml.BindingElement#addBindingFaultElement(org.apache.woden.wsdl20.xml.BindingFaultElement)
+ * @see org.apache.woden.wsdl20.xml.BindingElement#addBindingFaultElement()
*/
- public void addBindingFaultElement(BindingFaultElement fault)
+ public BindingFaultElement addBindingFaultElement()
{
- if(fault != null) {
- fFaults.add(fault);
- fault.setParentElement(this);
- }
+ BindingFaultElement fault = new BindingFaultImpl();
+ fFaults.add(fault);
+ fault.setParentElement(this);
+ return fault;
}
/*
@@ -193,14 +193,14 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.BindingElement#addBindingOperationElement(org.apache.woden.wsdl20.xml.BindingOperationElement)
+ * @see
org.apache.woden.wsdl20.xml.BindingElement#addBindingOperationElement()
*/
- public void addBindingOperationElement(BindingOperationElement operation)
+ public BindingOperationElement addBindingOperationElement()
{
- if(operation != null) {
- fOperations.add(operation);
- operation.setParentElement(this);
- }
+ BindingOperationElement operation = new BindingOperationImpl();
+ fOperations.add(operation);
+ operation.setParentElement(this);
+ return operation;
}
/* (non-Javadoc)
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/BindingElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/BindingElement.java?rev=426030&r1=426029&r2=426030&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/BindingElement.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/BindingElement.java
Thu Jul 27 04:08:25 2006
@@ -74,11 +74,11 @@
* Elements
*/
- public void addBindingFaultElement(BindingFaultElement fault);
+ public BindingFaultElement addBindingFaultElement();
public BindingFaultElement[] getBindingFaultElements();
//TODO remove method
- public void addBindingOperationElement(BindingOperationElement operation);
+ public BindingOperationElement addBindingOperationElement();
public BindingOperationElement[] getBindingOperationElements();
//TODO remove method
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=426030&r1=426029&r2=426030&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
Thu Jul 27 04:08:25 2006
@@ -1755,8 +1755,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationElement bindingOperation = new BindingOperationImpl();
- binding.addBindingOperationElement(bindingOperation);
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a
binding with an interface and an operation specified.");
@@ -1778,8 +1777,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingFaultElement bindingFault = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a
binding with an interface and a fault specified.");
@@ -1801,10 +1799,8 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingFaultElement bindingFault = new BindingFaultImpl();
- BindingOperationElement bindingOperation = new BindingOperationImpl();
- binding.addBindingFaultElement(bindingFault);
- binding.addBindingOperationElement(bindingOperation);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a
binding with an interface and an operation and a fault specified.");
@@ -1823,8 +1819,7 @@
desc.setTargetNamespace(namespace1);
BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingOperationElement bindingOperation = new BindingOperationImpl();
- binding.addBindingOperationElement(bindingOperation);
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
if(val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned true for a
binding with an operation and no interface.");
@@ -1843,8 +1838,7 @@
desc.setTargetNamespace(namespace1);
BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingFaultElement bindingFault = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
if(val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned true for a
binding with a fault and no interface.");
@@ -1862,10 +1856,8 @@
DescriptionImpl desc = new DescriptionImpl();
BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingFaultElement bindingFault = new BindingFaultImpl();
- BindingOperationElement bindingOperation = new BindingOperationImpl();
- binding.addBindingFaultElement(bindingFault);
- binding.addBindingOperationElement(bindingOperation);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
if(val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned true for a
binding with an operation and a fault and no interface.");
@@ -2107,7 +2099,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- binding.addBindingOperationElement(new BindingOperationImpl());
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a
binding with an interface with no operations and one binding operation
defined.");
@@ -2130,11 +2122,10 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name2QN);
interfac.addInterfaceOperationElement(interfaceOperation);
- binding.addBindingOperationElement(bindingOperation);
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a
binding with an interface with one operation and one binding operation
defined.");
@@ -2185,11 +2176,10 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
interfac2.addInterfaceOperationElement(interfaceOperation);
- binding.addBindingOperationElement(bindingOperation);
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a
binding with an interface with one extended operation and one binding operation
defined.");
@@ -2245,15 +2235,13 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
- BindingOperationImpl bindingOperation2 = new BindingOperationImpl();
+ BindingOperationElement bindingOperation2 =
binding.addBindingOperationElement();
bindingOperation2.setRef(name4QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
- binding.addBindingOperationElement(bindingOperation);
- binding.addBindingOperationElement(bindingOperation2);
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a
binding with an interface with one defined operation and one extended operation
and two binding operations defined.");
@@ -2282,12 +2270,11 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationElement bindingOperation =
desc.createBindingOperationElement();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
- binding.addBindingOperationElement(bindingOperation);
if(val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned true for a
binding with an interface with one defined operation and one extended operation
and one binding operation defined for the defined operation.");
@@ -2316,12 +2303,11 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name4QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
- binding.addBindingOperationElement(bindingOperation);
if(val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned true for a
binding with an interface with one defined operation and one inherited
operation and one binding operation defined for the inherited operation.");
@@ -2401,11 +2387,10 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name2QN);
interfac.addInterfaceOperationElement(interfaceOperation);
- binding.addBindingOperationElement(bindingOperation);
if(!val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(),
reporter))
{
fail("The testAssertionBindingOperation0059 method returned false
with one valid binding operation defined.");
@@ -2431,15 +2416,13 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
- BindingOperationImpl bindingOperation2 = new BindingOperationImpl();
+ BindingOperationElement bindingOperation2 =
binding.addBindingOperationElement();
bindingOperation2.setRef(name4QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac.addInterfaceOperationElement(interfaceOperation2);
- binding.addBindingOperationElement(bindingOperation);
- binding.addBindingOperationElement(bindingOperation2);
if(!val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(),
reporter))
{
fail("The testAssertionBindingOperation0059 method returned false
with two valid binding operations defined.");
@@ -2464,14 +2447,12 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
- BindingOperationImpl bindingOperation2 = new BindingOperationImpl();
+ BindingOperationElement bindingOperation2 =
binding.addBindingOperationElement();
bindingOperation2.setRef(name3QN);
interfac.addInterfaceOperationElement(interfaceOperation);
- binding.addBindingOperationElement(bindingOperation);
- binding.addBindingOperationElement(bindingOperation2);
if(val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(),
reporter))
{
fail("The testAssertionBindingOperation0059 method returned true
with two binding operations defined with the same interface operation.");
@@ -2516,14 +2497,13 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
BindingMessageReferenceImpl bindingMessageReference = new
BindingMessageReferenceImpl();
bindingMessageReference.setMessageLabel(MessageLabel.IN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceMessageReferenceElement(interfaceMessageReference);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
if(!val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(),
reporter))
{
@@ -2552,7 +2532,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
BindingMessageReferenceImpl bindingMessageReference = new
BindingMessageReferenceImpl();
bindingMessageReference.setMessageLabel(MessageLabel.IN);
@@ -2562,7 +2542,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceMessageReferenceElement(interfaceMessageReference);
interfaceOperation.addInterfaceMessageReferenceElement(interfaceMessageReference2);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference2);
if(!val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(),
reporter))
@@ -2591,7 +2570,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name3QN);
BindingMessageReferenceImpl bindingMessageReference = new
BindingMessageReferenceImpl();
bindingMessageReference.setMessageLabel(MessageLabel.IN);
@@ -2600,7 +2579,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceMessageReferenceElement(interfaceMessageReference);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference2);
if(val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(),
reporter))
@@ -2651,7 +2629,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name4QN);
BindingFaultReferenceImpl bindingFaultReference = new
BindingFaultReferenceImpl();
bindingFaultReference.setMessageLabel(MessageLabel.IN);
@@ -2660,7 +2638,6 @@
interfac.addInterfaceFaultElement(interfaceFault);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
if(!val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(),
reporter))
{
@@ -2693,7 +2670,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name4QN);
BindingFaultReferenceImpl bindingFaultReference = new
BindingFaultReferenceImpl();
bindingFaultReference.setMessageLabel(MessageLabel.IN);
@@ -2706,7 +2683,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference2);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference2);
if(!val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(),
reporter))
@@ -2738,7 +2714,7 @@
BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
bindingOperation.setRef(name4QN);
BindingFaultReferenceImpl bindingFaultReference = new
BindingFaultReferenceImpl();
bindingFaultReference.setMessageLabel(MessageLabel.IN);
@@ -2750,7 +2726,6 @@
interfac.addInterfaceFaultElement(interfaceFault);
interfac.addInterfaceOperationElement(interfaceOperation);
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
- binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference2);
if(val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(),
reporter))
@@ -2792,11 +2767,10 @@
BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOper = new BindingOperationImpl();
- binding.addBindingOperationElement(bindingOper);
- bindingOper.setRef(name1QN);
+ BindingOperationElement bindingOperation =
binding.addBindingOperationElement();
+ bindingOperation.setRef(name1QN);
BindingFaultReferenceImpl bindingFaultReference = new
BindingFaultReferenceImpl();
- bindingOper.addBindingFaultReferenceElement(bindingFaultReference);
+ bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
bindingFaultReference.setRef(name2QN);
bindingFaultReference.setMessageLabel(MessageLabel.IN);
@@ -2863,13 +2837,12 @@
BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
- BindingFaultImpl bindingFault = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
bindingFault.setRef(name2QN);
desc.getBindings(); //init Binding's ref to its Description
- if(!val.testAssertionBindingFault0058(new BindingFault[]{bindingFault},
reporter))
+ if(!val.testAssertionBindingFault0058(new
BindingFault[]{(BindingFaultImpl)bindingFault}, reporter))
{
fail("The testAssertionBindingFault0058 method returned false for
an list of binding faults that contains only one binding.");
}
@@ -2898,19 +2871,16 @@
BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
- BindingFaultImpl bindingFault = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
bindingFault.setRef(name1QN);
- BindingFaultImpl bindingFault2 = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault2);
+ BindingFaultElement bindingFault2 = binding.addBindingFaultElement();
bindingFault2.setRef(name2QN);
- BindingFaultImpl bindingFault3 = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault3);
+ BindingFaultElement bindingFault3 = binding.addBindingFaultElement();
bindingFault3.setRef(name3QN);
desc.getBindings(); //init Binding's ref to its Description
- BindingFault[] bindingFaults = new BindingFault[]{bindingFault,
bindingFault2, bindingFault3};
+ BindingFault[] bindingFaults = new
BindingFault[]{(BindingFaultImpl)bindingFault, (BindingFaultImpl)bindingFault2,
(BindingFaultImpl)bindingFault3};
if(!val.testAssertionBindingFault0058(bindingFaults, reporter))
{
@@ -2938,19 +2908,16 @@
BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
- BindingFaultImpl bindingFault = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault);
+ BindingFaultElement bindingFault = binding.addBindingFaultElement();
bindingFault.setRef(name1QN);
- BindingFaultImpl bindingFault2 = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault2);
+ BindingFaultElement bindingFault2 = binding.addBindingFaultElement();
bindingFault2.setRef(name2QN);
- BindingFaultImpl bindingFault3 = new BindingFaultImpl();
- binding.addBindingFaultElement(bindingFault3);
+ BindingFaultElement bindingFault3 = binding.addBindingFaultElement();
bindingFault3.setRef(name1QN);
desc.getBindings(); //init Binding's ref to its Description
- BindingFault[] bindingFaults = new BindingFault[]{bindingFault,
bindingFault2, bindingFault3};
+ BindingFault[] bindingFaults = new
BindingFault[]{(BindingFaultImpl)bindingFault, (BindingFaultImpl)bindingFault2,
(BindingFaultImpl)bindingFault3};
if(val.testAssertionBindingFault0058(bindingFaults, reporter))
{
Modified:
incubator/woden/branches/WODEN-40/test/org/apache/woden/tests/W3CFileRepository.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/test/org/apache/woden/tests/W3CFileRepository.java?rev=426030&r1=426029&r2=426030&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/test/org/apache/woden/tests/W3CFileRepository.java
(original)
+++
incubator/woden/branches/WODEN-40/test/org/apache/woden/tests/W3CFileRepository.java
Thu Jul 27 04:08:25 2006
@@ -62,7 +62,7 @@
File localFile = new File(localPath);
if (localFile.exists()) {
try {
- return localFile.toURL().toString();
+ return localFile.toURI().toURL().toString();
} catch (MalformedURLException mue) {
System.err.println("Got MalformedURLException trying to create
a URL from " + localPath);
return path;
Added:
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=426030&view=auto
==============================================================================
---
incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java
(added)
+++
incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ChildElementCreationTest.java
Thu Jul 27 04:08:25 2006
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2006 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.woden.wsdl20.xml;
+
+import java.util.Arrays;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.woden.internal.wsdl20.DescriptionImpl;
+
+public class ChildElementCreationTest extends TestCase {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(ChildElementCreationTest.class);
+ }
+
+ public static Test suite() {
+ return new TestSuite(ChildElementCreationTest.class);
+ }
+
+ public void testBindingFaultElement() {
+ DescriptionElement descEl = new DescriptionImpl();
+ BindingElement bindEl = descEl.createBindingElement();
+
+ BindingFaultElement bindFEl = bindEl.addBindingFaultElement();
+
+ assertTrue("BindingElement doesn't have correct BindingFaultElement",
+
Arrays.asList(bindEl.getBindingFaultElements()).contains(bindFEl));
+ assertTrue("BindingFaultElement has incorrect parent",
bindFEl.getParentElement() == bindEl);
+ }
+
+ public void testBindingOperationElement() {
+ DescriptionElement descEl = new DescriptionImpl();
+ BindingElement bindEl = descEl.createBindingElement();
+
+ BindingOperationElement bindOpEl = bindEl.addBindingOperationElement();
+
+ assertTrue("BindingElement doesn't have correct
BindingOperationElement",
+
Arrays.asList(bindEl.getBindingOperationElements()).contains(bindOpEl));
+ assertTrue("BindingOperationElement has incorrect parent",
bindOpEl.getParentElement() == bindEl);
+
+ }
+
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
