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/03 16:52:15 UTC
svn commit: r418783 - 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 3 07:52:14 2006
New Revision: 418783
URL: http://svn.apache.org/viewvc?rev=418783&view=rev
Log:
Removed addXxx methods from DescriptionElement.
Refactored test code to cope.
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/wsdl20/xml/DescriptionElement.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/ServiceElementTest.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=418783&r1=418782&r2=418783&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 3 07:52:14 2006
@@ -362,7 +362,7 @@
{
wsdlModules.put(documentBaseURI, desc);
}
- desc.addImportElement(parseImport(tempEl, desc, wsdlModules));
+ parseImport(tempEl, desc, wsdlModules);
}
else if (QNameUtils.matches(Constants.Q_ELEM_INCLUDE, tempEl))
{
@@ -370,7 +370,7 @@
{
wsdlModules.put(documentBaseURI, desc);
}
- desc.addIncludeElement(parseInclude(tempEl, desc, wsdlModules));
+ parseInclude(tempEl, desc, wsdlModules);
}
else if (QNameUtils.matches(Constants.Q_ELEM_TYPES, tempEl))
{
@@ -378,15 +378,15 @@
}
else if (QNameUtils.matches(Constants.Q_ELEM_INTERFACE, tempEl))
{
- desc.addInterfaceElement(parseInterface(tempEl, desc));
+ parseInterface(tempEl, desc);
}
else if (QNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl))
{
- desc.addBindingElement(parseBinding(tempEl, desc));
+ parseBinding(tempEl, desc);
}
else if (QNameUtils.matches(Constants.Q_ELEM_SERVICE, tempEl))
{
- desc.addServiceElement(parseService(tempEl, desc));
+ parseService(tempEl, desc);
}
else
{
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=418783&r1=418782&r2=418783&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 3 07:52:14 2006
@@ -432,13 +432,6 @@
{
return fNamespaces;
}
-
- public void addImportElement(ImportElement importEl)
- {
- if(importEl != null) {
- fImportElements.add(importEl);
- }
- }
public ImportElement[] getImportElements()
{
@@ -447,13 +440,6 @@
return array;
}
- public void addIncludeElement(IncludeElement include)
- {
- if(include != null) {
- fIncludeElements.add(include);
- }
- }
-
public IncludeElement[] getIncludeElements()
{
IncludeElement[] array = new IncludeElement[fIncludeElements.size()];
@@ -471,14 +457,6 @@
{
return fTypesElement;
}
-
- public void addInterfaceElement(InterfaceElement intface)
- {
- if(intface != null) {
- fInterfaceElements.add(intface);
- intface.setParentElement(this);
- }
- }
public InterfaceElement[] getInterfaceElements()
{
@@ -487,14 +465,6 @@
return array;
}
- public void addBindingElement(BindingElement binding)
- {
- if(binding != null) {
- fBindingElements.add(binding);
- binding.setParentElement(this);
- }
- }
-
public BindingElement[] getBindingElements()
{
BindingElement[] array = new BindingElement[fBindingElements.size()];
@@ -502,14 +472,6 @@
return array;
}
- public void addServiceElement(ServiceElement service)
- {
- if(service != null) {
- fServiceElements.add(service);
- service.setParentElement(this);
- }
- }
-
public ServiceElement[] getServiceElements()
{
ServiceElement[] array = new ServiceElement[fServiceElements.size()];
@@ -524,11 +486,15 @@
}
public ImportElement createImportElement() {
- return new ImportImpl();
+ ImportElement importEl = new ImportImpl();
+ fImportElements.add(importEl);
+ return importEl;
}
public IncludeElement createIncludeElement() {
- return new IncludeImpl();
+ IncludeElement include = new IncludeImpl();
+ fIncludeElements.add(include);
+ return include;
}
public TypesElement createTypesElement() {
@@ -536,7 +502,11 @@
}
public InterfaceElement createInterfaceElement() {
- return new InterfaceImpl();
+ InterfaceElement intface = new InterfaceImpl();
+ fInterfaceElements.add(intface);
+ intface.setParentElement(this);
+
+ return intface;
}
public InterfaceFaultElement createInterfaceFaultElement() {
@@ -556,7 +526,10 @@
}
public BindingElement createBindingElement() {
- return new BindingImpl();
+ BindingElement binding = new BindingImpl();
+ fBindingElements.add(binding);
+ binding.setParentElement(this);
+ return binding;
}
public BindingFaultElement createBindingFaultElement() {
@@ -576,7 +549,10 @@
}
public ServiceElement createServiceElement() {
- return new ServiceImpl();
+ ServiceElement service = new ServiceImpl();
+ fServiceElements.add(service);
+ service.setParentElement(this);
+ return service;
}
public EndpointElement createEndpointElement() {
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=418783&r1=418782&r2=418783&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 3 07:52:14 2006
@@ -85,6 +85,10 @@
public TypesElement createTypesElement();
+ /**
+ * Create a new InterfaceElement in this DescriptionElement
+ * @return the InterfaceElement created
+ */
public InterfaceElement createInterfaceElement();
public InterfaceFaultElement createInterfaceFaultElement();
@@ -121,22 +125,17 @@
*
*/
- public void addImportElement(ImportElement importEl);
public ImportElement[] getImportElements();
- public void addIncludeElement(IncludeElement includeEl);
public IncludeElement[] getIncludeElements();
public void setTypesElement(TypesElement typesEl);
public TypesElement getTypesElement();
- public void addInterfaceElement(InterfaceElement interfaceEl);
public InterfaceElement[] getInterfaceElements();
- public void addBindingElement(BindingElement bindingEl);
public BindingElement[] getBindingElements();
- public void addServiceElement(ServiceElement serviceEl);
public ServiceElement[] getServiceElements();
//TODO extension elements
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=418783&r1=418782&r2=418783&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 3 07:52:14 2006
@@ -29,7 +29,6 @@
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.wsdl20.BindingFaultImpl;
import org.apache.woden.internal.wsdl20.BindingFaultReferenceImpl;
-import org.apache.woden.internal.wsdl20.BindingImpl;
import org.apache.woden.internal.wsdl20.BindingMessageReferenceImpl;
import org.apache.woden.internal.wsdl20.BindingOperationImpl;
import org.apache.woden.internal.wsdl20.Constants;
@@ -64,12 +63,15 @@
import org.apache.woden.wsdl20.Property;
import org.apache.woden.wsdl20.Service;
import org.apache.woden.wsdl20.enumeration.MessageLabel;
+import org.apache.woden.wsdl20.xml.BindingElement;
import org.apache.woden.wsdl20.xml.BindingFaultElement;
import org.apache.woden.wsdl20.xml.BindingOperationElement;
import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.xml.EndpointElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
+import org.apache.woden.wsdl20.xml.ServiceElement;
/**
* A test class to test the assertion tests in the WSDLComponentValidator.
@@ -152,24 +154,20 @@
// Create an interface element, name it and add to the description element
InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
// Create another interface element, name it and add to the description element
InterfaceElement interfac2 = desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
interfac.addExtendedInterfaceName(interfac2.getName());
InterfaceElement interfac3 = desc.createInterfaceElement();
interfac3.setName(name3);
- desc.addInterfaceElement(interfac3);
interfac.addExtendedInterfaceName(interfac3.getName());
InterfaceElement interfac4 = desc.createInterfaceElement();
interfac4.setName(name4);
- desc.addInterfaceElement(interfac4);
interfac2.addExtendedInterfaceName(interfac4.getName());
@@ -192,13 +190,10 @@
desc.setTargetNamespace(namespace1);
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
InterfaceImpl interfac2 = (InterfaceImpl)desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
InterfaceImpl interfac3 = (InterfaceImpl)desc.createInterfaceElement();
interfac3.setName(name3);
- desc.addInterfaceElement(interfac3);
interfac.addExtendedInterfaceName(interfac.getName());
interfac.addExtendedInterfaceName(interfac2.getName());
interfac.addExtendedInterfaceName(interfac3.getName());
@@ -221,13 +216,10 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
InterfaceImpl interfac2 = (InterfaceImpl)desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
InterfaceImpl interfac3 = (InterfaceImpl)desc.createInterfaceElement();
interfac3.setName(name3);
- desc.addInterfaceElement(interfac3);
interfac.addExtendedInterfaceName(interfac2.getName());
interfac.addExtendedInterfaceName(interfac3.getName());
interfac2.addExtendedInterfaceName(interfac.getName());
@@ -271,7 +263,6 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
if(!val.testAssertionInterface0030(new Interface[]{interfac}, reporter))
{
fail("The testAssertionInterface0030 method returned false for an list of interfaces that contains only one interface.");
@@ -288,13 +279,10 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
InterfaceImpl interfac2 = (InterfaceImpl)desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
InterfaceImpl interfac3 = (InterfaceImpl)desc.createInterfaceElement();
interfac3.setName(name3);
- desc.addInterfaceElement(interfac3);
Interface[] interfaces = new Interface[]{interfac, interfac2, interfac3};
@@ -314,13 +302,10 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
InterfaceImpl interfac2 = (InterfaceImpl)desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
InterfaceImpl interfac3 = (InterfaceImpl)desc.createInterfaceElement();
interfac3.setName(name1);
- desc.addInterfaceElement(interfac3);
Interface[] interfaces = new Interface[]{interfac, interfac2, interfac3};
@@ -341,13 +326,10 @@
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
interfac.setName(name1);
- desc.addInterfaceElement(interfac);
InterfaceImpl interfac2 = (InterfaceImpl)desc.createInterfaceElement();
interfac2.setName(name2);
- desc.addInterfaceElement(interfac2);
InterfaceImpl interfac3 = (InterfaceImpl)desc.createInterfaceElement();
interfac3.setName(new NCName("name1"));
- desc.addInterfaceElement(interfac3);
Interface[] interfaces = new Interface[]{interfac, interfac2, interfac3};
@@ -421,7 +403,6 @@
// Create and add an interface element to the description element
InterfaceElement interfaceElem = descElem.createInterfaceElement();
- descElem.addInterfaceElement(interfaceElem);
interfaceElem.setName(new NCName(interfaceName.getLocalPart()));
@@ -492,7 +473,6 @@
// enclosing DescriptionElement.
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceOperationElement ioe = descElem.createInterfaceOperationElement();
ie.addInterfaceOperationElement(ioe);
InterfaceOperation interfaceOperation = (InterfaceOperation)ioe;
@@ -513,7 +493,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
ie.addInterfaceOperationElement(interfaceOperation);
@@ -542,7 +521,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
ie.addInterfaceOperationElement(interfaceOperation);
@@ -572,7 +550,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
ie.addInterfaceOperationElement(interfaceOperation);
@@ -622,7 +599,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
ie.addInterfaceFaultElement(interfaceFault);
@@ -642,7 +618,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
ie.addInterfaceFaultElement(interfaceFault);
@@ -671,7 +646,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
ie.addInterfaceFaultElement(interfaceFault);
@@ -701,7 +675,6 @@
{
DescriptionElement descElem = new DescriptionImpl();
InterfaceElement ie = descElem.createInterfaceElement();
- descElem.addInterfaceElement(ie);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
ie.addInterfaceFaultElement(interfaceFault);
@@ -738,7 +711,6 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceImpl interfac = (InterfaceImpl)desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
interfac.setName(new NCName("interfacename"));
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfac.addInterfaceFaultElement(interfaceFault);
@@ -792,7 +764,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -821,7 +792,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -850,7 +820,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -880,7 +849,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -909,7 +877,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -938,7 +905,6 @@
ed.setName(name1);
desc.addElementDeclaration(ed);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1063,7 +1029,6 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1093,7 +1058,6 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1130,7 +1094,6 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1164,7 +1127,6 @@
{
DescriptionImpl desc = new DescriptionImpl();
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1202,7 +1164,6 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
interfac.addInterfaceFaultElement(fault);
fault.setName(name1);
@@ -1236,7 +1197,6 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1265,7 +1225,6 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceOperationElement oper = desc.createInterfaceOperationElement();
interfac.addInterfaceOperationElement(oper);
@@ -1293,7 +1252,6 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
InterfaceElement interfac = desc.createInterfaceElement();
- desc.addInterfaceElement(interfac);
InterfaceFaultElement fault = desc.createInterfaceFaultElement();
fault.setName(name1);
interfac.addInterfaceFaultElement(fault);
@@ -1754,9 +1712,8 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- BindingImpl binding = new BindingImpl();
- binding.setName(name1);
- desc.addBindingElement(binding);
+ BindingElement bindingEl = desc.createBindingElement();
+ bindingEl.setName(name1);
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a binding with no interface, operation, or faults specified.");
@@ -1772,13 +1729,11 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a binding with an interface and no operation or faults specified.");
@@ -1795,15 +1750,13 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationElement bindingOperation = new BindingOperationImpl();
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a binding with an interface and an operation specified.");
@@ -1820,15 +1773,13 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingFaultElement bindingFault = new BindingFaultImpl();
binding.addBindingFaultElement(bindingFault);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned false for a binding with an interface and a fault specified.");
@@ -1845,17 +1796,15 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingFaultElement bindingFault = new BindingFaultImpl();
BindingOperationElement bindingOperation = new BindingOperationImpl();
binding.addBindingFaultElement(bindingFault);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
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.");
@@ -1872,11 +1821,10 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
BindingOperationElement bindingOperation = new BindingOperationImpl();
binding.addBindingOperationElement(bindingOperation);
- desc.addBindingElement(binding);
if(val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned true for a binding with an operation and no interface.");
@@ -1893,11 +1841,10 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
BindingFaultElement bindingFault = new BindingFaultImpl();
binding.addBindingFaultElement(bindingFault);
- desc.addBindingElement(binding);
if(val.testAssertionBinding0054(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0054 method returned true for a binding with a fault and no interface.");
@@ -1913,13 +1860,12 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
BindingFaultElement bindingFault = new BindingFaultImpl();
BindingOperationElement bindingOperation = new BindingOperationImpl();
binding.addBindingFaultElement(bindingFault);
binding.addBindingOperationElement(bindingOperation);
- desc.addBindingElement(binding);
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.");
@@ -1941,9 +1887,10 @@
// Test that the assertion returns true for a binding with an absolute type.
try
{
- BindingImpl binding = new BindingImpl();
+ DescriptionImpl desc = new DescriptionImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setType(new URI("http://www.sample.org"));
- if(!val.testAssertionBinding0056(binding, reporter))
+ if(!val.testAssertionBinding0056(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0056 method returned false for a binding with an absolute type.");
}
@@ -1962,10 +1909,9 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setType(new URI("sample.org"));
- if(val.testAssertionBinding0056(binding, reporter))
+ if(val.testAssertionBinding0056(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0056 method returned true for a binding with a relative type.");
}
@@ -1983,8 +1929,9 @@
// caught be schema validation.
try
{
- BindingImpl binding = new BindingImpl();
- if(!val.testAssertionBinding0056(binding, reporter))
+ DescriptionImpl desc = new DescriptionImpl();
+ BindingElement binding = desc.createBindingElement();
+ if(!val.testAssertionBinding0056(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0056 method returned false for a binding with a null type.");
}
@@ -2018,12 +1965,11 @@
// Test that the assertion returns true for a list of bindings that only contains one binding.
try
{
- DescriptionElement desc = new DescriptionImpl();
+ DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- if(!val.testAssertionBinding0057(new Binding[]{binding}, reporter))
+ if(!val.testAssertionBinding0057(desc.getBindings(), reporter))
{
fail("The testAssertionBinding0057 method returned false for an list of bindings that contains only one binding.");
}
@@ -2036,19 +1982,16 @@
// Test that the assertion returns true for a list of bindings that contains no duplicate names.
try
{
- DescriptionElement desc = new DescriptionImpl();
+ DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingImpl binding2 = new BindingImpl();
- desc.addBindingElement(binding2);
+ BindingElement binding2 = desc.createBindingElement();
binding2.setName(name2);
- BindingImpl binding3 = new BindingImpl();
- desc.addBindingElement(binding3);
+ BindingElement binding3 = desc.createBindingElement();
binding3.setName(name3);
- Binding[] bindings = new Binding[]{binding, binding2, binding3};
+ Binding[] bindings = desc.getBindings();
if(!val.testAssertionBinding0057(bindings, reporter))
{
@@ -2063,19 +2006,16 @@
// Test that the assertion returns false for two bindings that are defined with the same QName object.
try
{
- DescriptionElement desc = new DescriptionImpl();
+ DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingImpl binding2 = new BindingImpl();
- desc.addBindingElement(binding2);
+ BindingElement binding2 = desc.createBindingElement();
binding2.setName(name2);
- BindingImpl binding3 = new BindingImpl();
- desc.addBindingElement(binding3);
+ BindingElement binding3 = desc.createBindingElement();
binding3.setName(name1);
- Binding[] bindings = new Binding[]{binding, binding2, binding3};
+ Binding[] bindings = desc.getBindings();
if(val.testAssertionBinding0057(bindings, reporter))
{
@@ -2091,19 +2031,16 @@
// different QName objects.
try
{
- DescriptionElement desc = new DescriptionImpl();
+ DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- BindingImpl binding2 = new BindingImpl();
- desc.addBindingElement(binding2);
+ BindingElement binding2 = desc.createBindingElement();
binding2.setName(name2);
- BindingImpl binding3 = new BindingImpl();
- desc.addBindingElement(binding3);
+ BindingElement binding3 = desc.createBindingElement();
binding3.setName(new NCName("name1"));
- Binding[] bindings = new Binding[]{binding, binding2, binding3};
+ Binding[] bindings = desc.getBindings();
if(val.testAssertionBinding0057(bindings, reporter))
{
@@ -2128,9 +2065,8 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
- desc.addBindingElement(binding);
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a binding with no defined interface.");
@@ -2146,13 +2082,11 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned false for a binding with an interface with no operations.");
@@ -2168,14 +2102,12 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
binding.addBindingOperationElement(new BindingOperationImpl());
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
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.");
@@ -2191,11 +2123,11 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name2);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2203,8 +2135,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
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.");
@@ -2221,17 +2151,15 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name2);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
interfac.addInterfaceOperationElement(interfaceOperation);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned true for a binding with an interface with one operation and no binding operation defined.");
@@ -2247,14 +2175,14 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
InterfaceImpl interfac2 = new InterfaceImpl();
interfac2.setName(name2);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2262,9 +2190,6 @@
interfac2.addInterfaceOperationElement(interfaceOperation);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
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.");
@@ -2281,21 +2206,18 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
- InterfaceImpl interfac2 = new InterfaceImpl();
+ InterfaceElement interfac2 = desc.createInterfaceElement();
interfac2.setName(name2);
- InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
+ InterfaceOperationElement interfaceOperation = desc.createInterfaceOperationElement();
interfaceOperation.setName(name3);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
interfac2.addInterfaceOperationElement(interfaceOperation);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
if(val.testAssertionBinding0055(desc.getBindings()[0], reporter))
{
fail("The testAssertionBinding0055 method returned true for a binding with an interface with one extended operation and no binding operation defined.");
@@ -2311,7 +2233,7 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
@@ -2320,7 +2242,7 @@
interfac2.setName(name2);
InterfaceOperationImpl interfaceOperation2 = new InterfaceOperationImpl();
interfaceOperation2.setName(name4);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2332,9 +2254,6 @@
interfac2.addInterfaceOperationElement(interfaceOperation2);
binding.addBindingOperationElement(bindingOperation);
binding.addBindingOperationElement(bindingOperation2);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
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.");
@@ -2351,27 +2270,24 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
- InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
+ InterfaceOperationElement interfaceOperation = desc.createInterfaceOperationElement();
interfaceOperation.setName(name3);
- InterfaceImpl interfac2 = new InterfaceImpl();
+ InterfaceElement interfac2 = desc.createInterfaceElement();
interfac2.setName(name2);
- InterfaceOperationImpl interfaceOperation2 = new InterfaceOperationImpl();
+ InterfaceOperationElement interfaceOperation2 = desc.createInterfaceOperationElement();
interfaceOperation2.setName(name4);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- BindingOperationImpl bindingOperation = new BindingOperationImpl();
+ BindingOperationElement bindingOperation = desc.createBindingOperationElement();
bindingOperation.setRef(name3QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
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.");
@@ -2388,7 +2304,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
@@ -2397,7 +2313,7 @@
interfac2.setName(name2);
InterfaceOperationImpl interfaceOperation2 = new InterfaceOperationImpl();
interfaceOperation2.setName(name4);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2406,9 +2322,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
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.");
@@ -2427,24 +2340,21 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
interfac.addExtendedInterfaceName(name2QN);
- InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
+ InterfaceOperationElement interfaceOperation = desc.createInterfaceOperationElement();
interfaceOperation.setName(name3);
- InterfaceImpl interfac2 = new InterfaceImpl();
+ InterfaceElement interfac2 = desc.createInterfaceElement();
interfac2.setName(name2);
- InterfaceOperationImpl interfaceOperation2 = new InterfaceOperationImpl();
+ InterfaceOperationElement interfaceOperation2 = desc.createInterfaceOperationElement();
interfaceOperation2.setName(name4);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
interfac.addInterfaceOperationElement(interfaceOperation);
interfac2.addInterfaceOperationElement(interfaceOperation2);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
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 no binding operations defined.");
@@ -2484,11 +2394,11 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name2);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2496,8 +2406,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
binding.addBindingOperationElement(bindingOperation);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(), reporter))
{
fail("The testAssertionBindingOperation0059 method returned false with one valid binding operation defined.");
@@ -2514,13 +2422,13 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
InterfaceOperationImpl interfaceOperation2 = new InterfaceOperationImpl();
interfaceOperation2.setName(name4);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2532,8 +2440,6 @@
interfac.addInterfaceOperationElement(interfaceOperation2);
binding.addBindingOperationElement(bindingOperation);
binding.addBindingOperationElement(bindingOperation2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(), reporter))
{
fail("The testAssertionBindingOperation0059 method returned false with two valid binding operations defined.");
@@ -2551,11 +2457,11 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2566,8 +2472,6 @@
interfac.addInterfaceOperationElement(interfaceOperation);
binding.addBindingOperationElement(bindingOperation);
binding.addBindingOperationElement(bindingOperation2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(val.testAssertionBindingOperation0059(desc.getBindings()[0].getBindingOperations(), reporter))
{
fail("The testAssertionBindingOperation0059 method returned true with two binding operations defined with the same interface operation.");
@@ -2603,13 +2507,13 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
InterfaceMessageReferenceImpl interfaceMessageReference = new InterfaceMessageReferenceImpl();
interfaceMessageReference.setMessageLabel(MessageLabel.IN);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2621,8 +2525,6 @@
interfaceOperation.addInterfaceMessageReferenceElement(interfaceMessageReference);
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(), reporter))
{
fail("The testAssertionBindingMessageReference0060 method returned false with one valid binding message reference defined.");
@@ -2639,7 +2541,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
@@ -2647,7 +2549,7 @@
interfaceMessageReference.setMessageLabel(MessageLabel.IN);
InterfaceMessageReferenceImpl interfaceMessageReference2 = new InterfaceMessageReferenceImpl();
interfaceMessageReference2.setMessageLabel(MessageLabel.OUT);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2663,8 +2565,6 @@
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(), reporter))
{
fail("The testAssertionBindingMessageReference0060 method returned false with two valid binding message references defined.");
@@ -2682,13 +2582,13 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceOperationImpl interfaceOperation = new InterfaceOperationImpl();
interfaceOperation.setName(name3);
InterfaceMessageReferenceImpl interfaceMessageReference = new InterfaceMessageReferenceImpl();
interfaceMessageReference.setMessageLabel(MessageLabel.IN);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2703,8 +2603,6 @@
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference);
bindingOperation.addBindingMessageReferenceElement(bindingMessageReference2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(val.testAssertionBindingMessageReference0060(desc.getBindings()[0].getBindingOperations()[0].getBindingMessageReferences(), reporter))
{
fail("The testAssertionBindingMessageReference0060 method returned true with two binding message references defined with the same interface message reference.");
@@ -2741,7 +2639,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfaceFault.setName(name3);
@@ -2750,7 +2648,7 @@
InterfaceFaultReferenceImpl interfaceFaultReference = new InterfaceFaultReferenceImpl();
interfaceFaultReference.setMessageLabel(MessageLabel.IN);
interfaceFaultReference.setRef(name3QN);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2764,8 +2662,6 @@
interfaceOperation.addInterfaceFaultReferenceElement(interfaceFaultReference);
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(), reporter))
{
fail("The testAssertionBindingFaultReference0061 method returned false with one valid binding fault reference defined.");
@@ -2782,7 +2678,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfaceFault.setName(name3);
@@ -2794,7 +2690,7 @@
InterfaceFaultReferenceImpl interfaceFaultReference2 = new InterfaceFaultReferenceImpl();
interfaceFaultReference2.setMessageLabel(MessageLabel.OUT);
interfaceFaultReference2.setRef(name3QN);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2813,8 +2709,6 @@
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(!val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(), reporter))
{
fail("The testAssertionBindingFaultReference0061 method returned false with two valid binding fault references defined.");
@@ -2832,7 +2726,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfaceFault.setName(name3);
@@ -2841,7 +2735,7 @@
InterfaceFaultReferenceImpl interfaceFaultReference = new InterfaceFaultReferenceImpl();
interfaceFaultReference.setMessageLabel(MessageLabel.IN);
interfaceFaultReference.setRef(name3QN);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOperation = new BindingOperationImpl();
@@ -2859,8 +2753,6 @@
binding.addBindingOperationElement(bindingOperation);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference);
bindingOperation.addBindingFaultReferenceElement(bindingFaultReference2);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
if(val.testAssertionBindingFaultReference0061(desc.getBindings()[0].getBindingOperations()[0].getBindingFaultReferences(), reporter))
{
fail("The testAssertionBindingFaultReference0061 method returned true with two binding fault references defined with the same interface fault reference.");
@@ -2885,8 +2777,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
- desc.addInterfaceElement(interfac);
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfac.addInterfaceFaultElement(interfaceFault);
@@ -2899,8 +2790,7 @@
interfaceFaultReference.setRef(name2QN);
interfaceFaultReference.setMessageLabel(MessageLabel.IN);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
BindingOperationImpl bindingOper = new BindingOperationImpl();
binding.addBindingOperationElement(bindingOper);
@@ -2965,15 +2855,13 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
- desc.addInterfaceElement(interfac);
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfac.addInterfaceFaultElement(interfaceFault);
interfaceFault.setName(name2);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
BindingFaultImpl bindingFault = new BindingFaultImpl();
binding.addBindingFaultElement(bindingFault);
@@ -2996,8 +2884,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
- desc.addInterfaceElement(interfac);
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfac.addInterfaceFaultElement(interfaceFault);
@@ -3009,8 +2896,7 @@
interfac.addInterfaceFaultElement(interfaceFault3);
interfaceFault.setName(name3);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
BindingFaultImpl bindingFault = new BindingFaultImpl();
binding.addBindingFaultElement(bindingFault);
@@ -3041,8 +2927,7 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
- desc.addInterfaceElement(interfac);
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
InterfaceFaultImpl interfaceFault = new InterfaceFaultImpl();
interfac.addInterfaceFaultElement(interfaceFault);
@@ -3051,8 +2936,7 @@
interfac.addInterfaceFaultElement(interfaceFault2);
interfaceFault2.setName(name2);
- BindingImpl binding = new BindingImpl();
- desc.addBindingElement(binding);
+ BindingElement binding = desc.createBindingElement();
binding.setInterfaceName(name1QN);
BindingFaultImpl bindingFault = new BindingFaultImpl();
binding.addBindingFaultElement(bindingFault);
@@ -3119,7 +3003,6 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
ServiceImpl service = new ServiceImpl();
- desc.addServiceElement(service);
service.setName(name1);
if(!val.testAssertionService0063(new Service[]{service}, reporter))
{
@@ -3137,13 +3020,10 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
ServiceImpl service = new ServiceImpl();
- desc.addServiceElement(service);
service.setName(name1);
ServiceImpl service2 = new ServiceImpl();
- desc.addServiceElement(service2);
service2.setName(name2);
ServiceImpl service3 = new ServiceImpl();
- desc.addServiceElement(service3);
service3.setName(name3);
Service[] services = new Service[]{service, service2, service3};
@@ -3164,13 +3044,10 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
ServiceImpl service = new ServiceImpl();
- desc.addServiceElement(service);
service.setName(name1);
ServiceImpl service2 = new ServiceImpl();
- desc.addServiceElement(service2);
service2.setName(name2);
ServiceImpl service3 = new ServiceImpl();
- desc.addServiceElement(service3);
service3.setName(name1);
Service[] services = new Service[]{service, service2, service3};
@@ -3192,13 +3069,10 @@
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
ServiceImpl service = new ServiceImpl();
- desc.addServiceElement(service);
service.setName(name1);
ServiceImpl service2 = new ServiceImpl();
- desc.addServiceElement(service2);
service2.setName(name2);
ServiceImpl service3 = new ServiceImpl();
- desc.addServiceElement(service3);
service3.setName(new NCName("name1"));
Service[] services = new Service[]{service, service2, service3};
@@ -3446,10 +3320,9 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- ServiceImpl service = new ServiceImpl();
- EndpointImpl endpoint = new EndpointImpl();
+ ServiceElement service = desc.createServiceElement();
+ EndpointElement endpoint = desc.createEndpointElement();
service.addEndpointElement(endpoint);
- desc.addServiceElement(service);
if(!val.testAssertionEndpoint0066(desc.getServices()[0].getEndpoints()[0], reporter))
{
fail("The testAssertionEndpoint0066 method returned false for an endpoint with no binding defined.");
@@ -3465,7 +3338,7 @@
try
{
EndpointImpl endpoint = new EndpointImpl();
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name1);
endpoint.setBindingName(name1);
if(!val.testAssertionEndpoint0066(endpoint, reporter))
@@ -3483,18 +3356,15 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
- ServiceImpl service = new ServiceImpl();
+ ServiceElement service = desc.createServiceElement();
service.setInterfaceName(name1QN);
- EndpointImpl endpoint = new EndpointImpl();
+ EndpointElement endpoint = desc.createEndpointElement();
endpoint.setBindingName(name2QN);
service.addEndpointElement(endpoint);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
- desc.addServiceElement(service);
if(!val.testAssertionEndpoint0066(desc.getServices()[0].getEndpoints()[0], reporter))
{
fail("The testAssertionEndpoint0066 method returned false for an endpoint that specifies a binding with no specified interface.");
@@ -3510,19 +3380,16 @@
try
{
DescriptionImpl desc = new DescriptionImpl();
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name2);
binding.setInterfaceName(name1QN);
- ServiceImpl service = new ServiceImpl();
+ ServiceElement service = desc.createServiceElement();
service.setInterfaceName(name1QN);
- EndpointImpl endpoint = new EndpointImpl();
+ EndpointElement endpoint = desc.createEndpointElement();
endpoint.setBindingName(name2QN);
service.addEndpointElement(endpoint);
- desc.addInterfaceElement(interfac);
- desc.addBindingElement(binding);
- desc.addServiceElement(service);
if(!val.testAssertionEndpoint0066(desc.getServices()[0].getEndpoints()[0], reporter))
{
fail("The testAssertionEndpoint0066 method returned false for an endpoint that specifies a binding with the same interface specified as the parent service specifies.");
@@ -3539,22 +3406,18 @@
{
DescriptionImpl desc = new DescriptionImpl();
desc.setTargetNamespace(namespace1);
- InterfaceImpl interfac = new InterfaceImpl();
+ InterfaceElement interfac = desc.createInterfaceElement();
interfac.setName(name1);
- InterfaceImpl interfac2 = new InterfaceImpl();
+ InterfaceElement interfac2 = desc.createInterfaceElement();
interfac2.setName(name2);
- BindingImpl binding = new BindingImpl();
+ BindingElement binding = desc.createBindingElement();
binding.setName(name3);
binding.setInterfaceName(name2QN);
- ServiceImpl service = new ServiceImpl();
+ ServiceElement service = desc.createServiceElement();
service.setInterfaceName(name1QN);
- EndpointImpl endpoint = new EndpointImpl();
+ EndpointElement endpoint = desc.createEndpointElement();
endpoint.setBindingName(name3QN);
service.addEndpointElement(endpoint);
- desc.addInterfaceElement(interfac);
- desc.addInterfaceElement(interfac2);
- desc.addBindingElement(binding);
- desc.addServiceElement(service);
if(val.testAssertionEndpoint0066(desc.getServices()[0].getEndpoints()[0], reporter))
{
fail("The testAssertionEndpoint0066 method returned true for an endpoint that specifies a binding with a different interface specified than the parent service specifies.");
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=418783&r1=418782&r2=418783&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 3 07:52:14 2006
@@ -1117,7 +1117,6 @@
messageRef.setElementName(new QName("http://www.sample.org","myElement"));
interfaceOperation.addInterfaceMessageReferenceElement(messageRef);
interfaceElem.addInterfaceOperationElement(interfaceOperation);
- descElem.addInterfaceElement(interfaceElem);
if(!val.testAssertionSchema0020(descElem, messageRef, reporter))
{
@@ -1143,7 +1142,6 @@
messageRef.setElementName(new QName("http://www.sample.org", "myElement"));
interfaceOperation.addInterfaceMessageReferenceElement(messageRef);
interfaceElem.addInterfaceOperationElement(interfaceOperation);
- descElem.addInterfaceElement(interfaceElem);
if(!val.testAssertionSchema0020(descElem, messageRef, reporter))
{
@@ -1170,7 +1168,6 @@
messageRef.setElementName(new QName("http://www.sample.org", "myElement2"));
interfaceOperation.addInterfaceMessageReferenceElement(messageRef);
interfaceElem.addInterfaceOperationElement(interfaceOperation);
- descElem.addInterfaceElement(interfaceElem);
if(!val.testAssertionSchema0020(descElem, messageRef, reporter))
{
@@ -1196,7 +1193,6 @@
messageRef.setElementName(new QName("http://www.sample.org", "myType"));
interfaceOperation.addInterfaceMessageReferenceElement(messageRef);
interfaceElem.addInterfaceOperationElement(interfaceOperation);
- descElem.addInterfaceElement(interfaceElem);
if(val.testAssertionSchema0020(descElem, messageRef, reporter))
{
@@ -1281,7 +1277,6 @@
InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myElement"));
interfaceElem.addInterfaceFaultElement(fault);
- descElem.addInterfaceElement(interfaceElem);
if(!val.testAssertionSchema0020b(descElem, fault, reporter))
{
@@ -1305,7 +1300,6 @@
InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myElement2"));
interfaceElem.addInterfaceFaultElement(fault);
- descElem.addInterfaceElement(interfaceElem);
if(!val.testAssertionSchema0020b(descElem, fault, reporter))
{
@@ -1328,7 +1322,6 @@
InterfaceFaultElement fault = descElem.createInterfaceFaultElement();
fault.setElementName(new QName("http://www.sample.org", "myType"));
interfaceElem.addInterfaceFaultElement(fault);
- descElem.addInterfaceElement(interfaceElem);
if(val.testAssertionSchema0020b(descElem, fault, reporter))
{
Modified: incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java?rev=418783&r1=418782&r2=418783&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java (original)
+++ incubator/woden/branches/WODEN-40/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java Mon Jul 3 07:52:14 2006
@@ -103,8 +103,7 @@
{
DescriptionElement descElem = new DescriptionImpl();
descElem.setTargetNamespace(new URI("urn:woden"));
- ServiceElement service = new ServiceImpl();
- descElem.addServiceElement(service);
+ ServiceElement service = descElem.createServiceElement();
service.setName(new NCName(fQName.getLocalPart()));
assertTrue("QName returned by ServiceElement.getName() was not the one set by setName().",
fQName.equals(service.getName()));
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org