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 jk...@apache.org on 2007/01/24 03:35:29 UTC
svn commit: r499213 [1/2] - in /incubator/woden/trunk/java:
src/org/apache/woden/ src/org/apache/woden/ant/
src/org/apache/woden/internal/ test/org/apache/woden/
test/org/apache/woden/resolver/ test/org/apache/woden/tests/
test/org/apache/woden/wsdl20/...
Author: jkaputin
Date: Tue Jan 23 18:35:28 2007
New Revision: 499213
URL: http://svn.apache.org/viewvc?view=rev&rev=499213
Log:
WODEN-120 Changed the WSDLReader API so that the
readWSDL methods return Description instead of
DescriptionElement. Modified the implementation
and test cases to match this API change.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/WSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java
incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/trunk/java/test/org/apache/woden/OMWSDLReaderTest.java
incubator/woden/trunk/java/test/org/apache/woden/WSDLReaderTest.java
incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java
incubator/woden/trunk/java/test/org/apache/woden/tests/OMW3CTestSuiteTest.java
incubator/woden/trunk/java/test/org/apache/woden/tests/W3CTestSuiteTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/EndpointElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMEndpointElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMServiceElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java
Modified: incubator/woden/trunk/java/src/org/apache/woden/WSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/WSDLReader.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/WSDLReader.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/WSDLReader.java Tue Jan 23 18:35:28 2007
@@ -16,8 +16,8 @@
package org.apache.woden;
import org.apache.woden.resolver.URIResolver;
+import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* This interface declares an API for reading WSDL descriptions from different sources
@@ -106,35 +106,31 @@
"http://www.w3.org/2001/XMLSchema";
/**
- * Read the WSDL document at the specified URI and return a WSDL Description component
- * containing the WSDL components derived from that document.
- *
- * TODO change the return type to Desription per WODEN-120
+ * Read the WSDL document at the specified URI and return a WSDL Description
+ * component containing the WSDL components derived from that document.
*
* @param wsdlURI a URI (absolute filename or URL) pointing to a
* WSDL document.
- * @return the description element of the WSDL document.
+ * @return the Description component
* @throws WSDLException for terminating errors and as wrapper
* for checked exceptions.
*/
- public DescriptionElement readWSDL(String wsdlURI) throws WSDLException;
+ public Description readWSDL(String wsdlURI) throws WSDLException;
/**
- * Read the WSDL document at the specified URI and return a WSDL Description component
- * containing the WSDL components derived from that document.
- * Use the specified custom error handler rather than the Woden default handler to handle
- * any WSDL parsing or validation error messages.
- *
- * TODO change the return type to Descriptioin per WODEN-120
+ * Read the WSDL document at the specified URI and return a WSDL Description
+ * component containing the WSDL components derived from that document.
+ * Use the specified custom error handler rather than the Woden default handler
+ * to handle any WSDL parsing or validation error messages.
*
* @param wsdlURI a URI (absolute filename or URL) pointing to a
* WSDL document.
* @param errorHandler An error handler that will handle reporting of errors and warnings.
- * @return the description element of the WSDL document.
+ * @return the Description component.
* @throws WSDLException for terminating errors and as wrapper
* for checked exceptions.
*/
- public DescriptionElement readWSDL(String wsdlURI, ErrorHandler errorHandler) throws WSDLException;
+ public Description readWSDL(String wsdlURI, ErrorHandler errorHandler) throws WSDLException;
/**
* Read the WSDL obtained from the specified WSDLSource object and return a WSDL Description
@@ -148,11 +144,11 @@
* or org.w3c.dom.Element), both of which should be type compatible the DOM-based reader.
*
* @param wsdlSource contains an object representing the WSDL
- * @return the DescriptionElement representing the parsed WSDL
+ * @return the Description component
* @throws WSDLException for terminating errors and as a wrapper
* for checked exceptions
*/
- public DescriptionElement readWSDL(WSDLSource wsdlSource) throws WSDLException;
+ public Description readWSDL(WSDLSource wsdlSource) throws WSDLException;
/**
* Read the WSDL obtained from the specified WSDLSource object and return a WSDL Description
@@ -169,11 +165,11 @@
*
* @param wsdlSource contains an object representing the WSDL
* @param errorHandler a custom error handler that overrides the default handler
- * @return the DescriptionElement representing the parsed WSDL
+ * @return the Description component
* @throws WSDLException for terminating errors and as a wrapper
* for checked exceptions
*/
- public DescriptionElement readWSDL(WSDLSource wsdlSource, ErrorHandler errorHandler) throws WSDLException;
+ public Description readWSDL(WSDLSource wsdlSource, ErrorHandler errorHandler) throws WSDLException;
//TODO - decide if an API method createXMLElement() is needed.
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java Tue Jan 23 18:35:28 2007
@@ -20,7 +20,6 @@
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.Service;
import org.apache.woden.wsdl20.TypeDefinition;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* This is an Ant task to validate WSDL 2.0 files.
@@ -291,12 +290,9 @@
reportWriter.beginWsdl(wsdlLoc);
try {
- // <-- the <description> element
- DescriptionElement desc = reader
- .readWSDL(wsdlLoc, reportWriter);
-
// <-- the Description component
- Description descComp = desc.toComponent();
+ Description descComp = reader
+ .readWSDL(wsdlLoc, reportWriter);
if (isCm()) {
// write the Component Model interchange format output file
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java Tue Jan 23 18:35:28 2007
@@ -38,7 +38,6 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* The <code>WsdlCm</code> class writes the component model in the W3C interchange format.
@@ -118,11 +117,8 @@
// <-- enable WSDL 2.0 validation (optional)
reader.setFeature(WSDLReader.FEATURE_VALIDATION, true);
- // <-- the <description> element
- DescriptionElement desc = reader.readWSDL(wsdlLoc, reportWriter);
-
// <-- the Description component
- Description descComp = desc.toComponent();
+ Description descComp = reader.readWSDL(wsdlLoc, reportWriter);
File xml = new File(wsdlCmLoc);
FileOutputStream fos = new FileOutputStream(xml);
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java Tue Jan 23 18:35:28 2007
@@ -41,6 +41,7 @@
import org.apache.woden.internal.wsdl20.validation.WSDLComponentValidator;
import org.apache.woden.internal.wsdl20.validation.WSDLDocumentValidator;
import org.apache.woden.schema.Schema;
+import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.ImportElement;
@@ -100,7 +101,7 @@
/*
* @see org.apache.woden.WSDLReader#readWSDL(String)
*/
- public DescriptionElement readWSDL(String wsdlURI) throws WSDLException
+ public Description readWSDL(String wsdlURI) throws WSDLException
{
URL url;
try {
@@ -122,7 +123,7 @@
/* (non-Javadoc)
* @see org.apache.woden.WSDLReader#readWSDL(java.lang.String, org.apache.woden.ErrorHandler)
*/
- public DescriptionElement readWSDL(String wsdlURI, ErrorHandler errorHandler) throws WSDLException
+ public Description readWSDL(String wsdlURI, ErrorHandler errorHandler) throws WSDLException
{
if(errorHandler != null)
getErrorReporter().setErrorHandler(errorHandler);
@@ -133,7 +134,7 @@
/* (non-Javadoc)
* @see org.apache.woden.WSDLReader#readWSDL(org.apache.woden.WSDLSource)
*/
- public DescriptionElement readWSDL(WSDLSource wsdlSource) throws WSDLException {
+ public Description readWSDL(WSDLSource wsdlSource) throws WSDLException {
//TODO decide on how to handle null args in readWSDL methods (e.g.
//IllegalArgExc, WSDLExc, return null, etc).
@@ -181,7 +182,7 @@
/* (non-Javadoc)
* @see org.apache.woden.WSDLReader#readWSDL(org.apache.woden.WSDLSource, org.apache.woden.ErrorHandler)
*/
- public DescriptionElement readWSDL(WSDLSource wsdlSource, ErrorHandler errorHandler)
+ public Description readWSDL(WSDLSource wsdlSource, ErrorHandler errorHandler)
throws WSDLException {
if(errorHandler != null)
@@ -193,12 +194,15 @@
/*
* Helper method for readWSDL(WSDLSource)
*/
- private DescriptionElement readWSDL(String wsdlURL, Element docEl)
+ private Description readWSDL(String wsdlURL, Element docEl)
throws WSDLException {
XMLElement descEl = createXMLElement(docEl);
- DescriptionElement desc = parseDescription(wsdlURL, descEl, null);
+ DescriptionElement descElem = parseDescription(wsdlURL, descEl, null);
+ Description descComp = descElem.toComponent();
+ //TODO if schema errors, don't do any further validation (i.e. assertions assume WSDL is schema valid)
+
// Validate the model if validation is enabled.
if(features.getValue(WSDLReader.FEATURE_VALIDATION))
{
@@ -206,22 +210,23 @@
{
docValidator = new WSDLDocumentValidator();
}
- if(docValidator.validate(desc, getErrorReporter()))
+ if(docValidator.validate(descElem, getErrorReporter()))
{
if(compValidator == null)
{
compValidator = new WSDLComponentValidator();
}
- compValidator.validate(desc.toComponent(), getErrorReporter());
+ compValidator.validate(descComp, getErrorReporter());
}
}
- return desc;
+
+ return descComp;
}
/*
* Helper method for readWSDL(WSDLSource)
*/
- private DescriptionElement readWSDL(String wsdlURL, Document domDoc)
+ private Description readWSDL(String wsdlURL, Document domDoc)
throws WSDLException {
return readWSDL(wsdlURL, domDoc.getDocumentElement());
@@ -230,7 +235,7 @@
/*
* Helper method for readWSDL(WSDLSource)
*/
- private DescriptionElement readWSDL(String wsdlURL, InputSource inputSource)
+ private Description readWSDL(String wsdlURL, InputSource inputSource)
throws WSDLException {
try
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java Tue Jan 23 18:35:28 2007
@@ -42,6 +42,7 @@
import org.apache.woden.internal.util.om.OMUtils;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.schema.Schema;
+import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.WSDLElement;
import org.apache.ws.commons.schema.XmlSchema;
@@ -62,7 +63,7 @@
super();
}
- public DescriptionElement readWSDL(String wsdlURI) throws WSDLException {
+ public Description readWSDL(String wsdlURI) throws WSDLException {
//This conversion to a URL is necessary to import the schema
URL url;
try {
@@ -86,7 +87,8 @@
}
XMLElement descEl = createXMLElement(wsdlDescription);
- return parseDescription(url.toString(), descEl, null);
+ DescriptionElement descElem = parseDescription(url.toString(), descEl, null);
+ return descElem.toComponent();
}
/*
@@ -165,8 +167,6 @@
*/
// contextURI = desc.getDocumentBaseURI();
contextURI = resolveURI(desc.getDocumentBaseURI());
- System.out.println(contextURI);
- System.out.println(contextURI.toURL());
URL contextURL = (contextURI != null) ? contextURI.toURL() : null;
schemaLoc = schema.getSchemaLocation().toString();
url = StringUtils.getURL(contextURL, schemaLoc);
@@ -211,20 +211,20 @@
}
/*
- * First get the first element and serialize that into a byte array.
+ * First get the schema element and serialize that into a byte array.
* This is used in getting an InputSource which is later used as an argument
* to the XMLSchemaCollection object.
*/
- schemaEl = importedSchemaDoc.getFirstElement();
String schemaElStr = null;
try {
- schemaElStr = schemaEl.toStringWithConsume();
+ schemaElStr = importedSchemaDoc.toStringWithConsume();
}
catch (XMLStreamException e) {
e.printStackTrace();
}
byte[] schemaElbytes = schemaElStr.getBytes();
InputSource schemaSource = new InputSource(new ByteArrayInputStream(schemaElbytes));
+ schemaSource.setSystemId(schemaURL);
try {
XmlSchemaCollection xsc = new XmlSchemaCollection();
@@ -324,7 +324,7 @@
}
- public DescriptionElement readWSDL(String wsdlURI,
+ public Description readWSDL(String wsdlURI,
ErrorHandler errorHandler)
throws WSDLException {
if(errorHandler != null)
@@ -338,14 +338,14 @@
///////////////////////////////////////
//TODO
- public DescriptionElement readWSDL(WSDLSource wsdlSource)
+ public Description readWSDL(WSDLSource wsdlSource)
throws WSDLException {
return null;
}
//TODO
- public DescriptionElement readWSDL(WSDLSource wsdlSource,
+ public Description readWSDL(WSDLSource wsdlSource,
ErrorHandler errorHandler)
throws WSDLException {
return null;
Modified: incubator/woden/trunk/java/test/org/apache/woden/OMWSDLReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/OMWSDLReaderTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/OMWSDLReaderTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/OMWSDLReaderTest.java Tue Jan 23 18:35:28 2007
@@ -22,7 +22,7 @@
import junit.framework.TestSuite;
import org.apache.woden.tests.TestErrorHandler;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.Description;
public class OMWSDLReaderTest extends TestCase{
@@ -47,7 +47,7 @@
}
public void testReadValidWSDL20FromOM(){
- DescriptionElement desc = null;
+ Description desc = null;
try{
URL wsdlURL = getClass().getClassLoader().getResource("./org/apache/woden/primer-hotelReservationService.wsdl");
desc = omWSDLReader.readWSDL(wsdlURL.toString(), handler);
Modified: incubator/woden/trunk/java/test/org/apache/woden/WSDLReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/WSDLReaderTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/WSDLReaderTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/WSDLReaderTest.java Tue Jan 23 18:35:28 2007
@@ -29,7 +29,7 @@
import junit.framework.TestSuite;
import org.apache.woden.tests.TestErrorHandler;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.Description;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -67,7 +67,7 @@
public void testReadValidWSDL20()
{
- DescriptionElement desc = null;
+ Description desc = null;
try
{
URL wsdlURL = getClass().getClassLoader().getResource("org/apache/woden/primer-hotelReservationService.wsdl");
@@ -97,7 +97,7 @@
public void testReadWSDLSourceDoc()
{
- DescriptionElement desc = null;
+ Description desc = null;
try
{
URL wsdlURL = getClass().getClassLoader().getResource("org/apache/woden/primer-hotelReservationService.wsdl");
@@ -134,7 +134,7 @@
public void testReadWSDLSourceIS()
{
- DescriptionElement desc = null;
+ Description desc = null;
try
{
URL wsdlURL = getClass().getClassLoader().getResource("org/apache/woden/primer-hotelReservationService.wsdl");
Modified: incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java Tue Jan 23 18:35:28 2007
@@ -17,7 +17,6 @@
import java.io.IOException;
-import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.util.Iterator;
@@ -117,13 +116,13 @@
reader.setURIResolver(new SimpleURIResolver());
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
fBindings = descComp.getBindings();
fInterfaces = descComp.getInterfaces();
+ DescriptionElement descElem = descComp.toElement();
TypesElement types = descElem.getTypesElement();
fSchemas = types.getSchemas();
fImportedSchemas = types.getImportedSchemas();
Modified: incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java Tue Jan 23 18:35:28 2007
@@ -17,7 +17,6 @@
import java.io.IOException;
-import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.util.Iterator;
@@ -122,13 +121,13 @@
//System.setProperty(fCatalogBaseProperty, rootURL.toString());
reader.setURIResolver(new SimpleURIResolver());
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
fBindings = descComp.getBindings();
fInterfaces = descComp.getInterfaces();
+ DescriptionElement descElem = descComp.toElement();
TypesElement types = descElem.getTypesElement();
fSchemas = types.getSchemas();
fImportedSchemas = types.getImportedSchemas();
Modified: incubator/woden/trunk/java/test/org/apache/woden/tests/OMW3CTestSuiteTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/tests/OMW3CTestSuiteTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/tests/OMW3CTestSuiteTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/tests/OMW3CTestSuiteTest.java Tue Jan 23 18:35:28 2007
@@ -21,7 +21,7 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.Description;
public class OMW3CTestSuiteTest extends TestCase{
@@ -67,8 +67,8 @@
*/
public void testChameleon1BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -81,8 +81,8 @@
*/
public void testChameleon2BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -95,8 +95,8 @@
*/
public void testImport1BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -109,8 +109,8 @@
*/
public void testImport2BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -123,8 +123,8 @@
*/
public void testImport3BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -137,8 +137,8 @@
*/
public void testInterface1BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -151,8 +151,8 @@
*/
public void testInterface2BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -165,8 +165,8 @@
*/
public void testInterface3BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -179,8 +179,8 @@
*/
public void testService1BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-1B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-1B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -193,8 +193,8 @@
*/
public void testService2BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-2B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-2B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -207,8 +207,8 @@
*/
public void testService12BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-12B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-12B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -221,8 +221,8 @@
*/
public void testService13BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-13B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-13B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -235,8 +235,8 @@
*/
public void testService14BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-14B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-14B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -249,8 +249,8 @@
*/
public void testService15BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-15B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-15B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -263,8 +263,8 @@
*/
public void testTicketAgent1BFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e){
@@ -283,8 +283,8 @@
*/
public void testChameleon1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -297,8 +297,8 @@
*/
public void testChameleon2GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -311,8 +311,8 @@
*/
public void testChameleon3GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -325,8 +325,8 @@
*/
public void testChameleon4GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-4G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -339,8 +339,8 @@
*/
public void testCreditCardFaults1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good CreditCardFaults-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -353,11 +353,11 @@
*/
public void testGreatH1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl"), handler);
- assertTrue("number of binding elements isn't 1", desc.getBindingElements().length == 1);
- assertTrue("interfacename is null", desc.toComponent().getBindings()[0].getInterface()!=null);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl"), handler);
+ assertTrue("number of bindings isn't 1", desc.getBindings().length == 1);
+ assertTrue("interfacename is null", desc.getBindings()[0].getInterface()!=null);
- assertNotNull("DescriptionElement is null.", desc);
+ assertNotNull("Description is null.", desc);
assertFalse("The good GreatH-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -370,8 +370,8 @@
*/
public void testImport1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Import-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -384,8 +384,8 @@
*/
public void testImport2GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Import-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -398,8 +398,8 @@
*/
public void testImportedWSDL1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ImportedWSDL-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -412,8 +412,8 @@
*/
public void testInterface1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-1G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-1G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -426,8 +426,8 @@
*/
public void testInterface2GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-2G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-2G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -440,8 +440,8 @@
*/
public void testInterface3GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-3G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-3G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -454,8 +454,8 @@
*/
public void testInterface4GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-4G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-4G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-4G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -468,8 +468,8 @@
*/
public void testInterface5GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-5G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-5G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-5G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -482,8 +482,8 @@
*/
public void testInterface6GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-6G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-6G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-6G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -496,8 +496,8 @@
*/
public void testInterface7GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-7G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-7G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-7G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -510,8 +510,8 @@
*/
public void testMultipleInlineSchemas1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good MultipleInlineSchemas-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -524,8 +524,8 @@
*/
public void testSchemaId1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good SchemaId-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -538,8 +538,8 @@
*/
public void testSchemaLocationFragment1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good SchemaLocationFragment-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -552,8 +552,8 @@
*/
public void testService1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-1G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-1G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -566,8 +566,8 @@
*/
public void testService2GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-2G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-2G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -580,8 +580,8 @@
*/
public void testService3GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-3G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-3G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -594,8 +594,8 @@
*/
public void testServiceReference1G1FromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ServiceReference-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -608,8 +608,8 @@
*/
public void testServiceReference1G2FromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ServiceReference-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -622,8 +622,8 @@
*/
public void testTicketAgent1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good TicketAgent-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -637,8 +637,8 @@
public void testWeathSvc1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
//TODO FIXME
assertFalse("The good WeathSvc-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
@@ -652,8 +652,8 @@
*/
public void testXsImport1GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -666,8 +666,8 @@
*/
public void testXsImport2GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
@@ -680,8 +680,8 @@
*/
public void testXsImport3GFromOM(){
try{
- DescriptionElement desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = omWSDLReader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e){
Modified: incubator/woden/trunk/java/test/org/apache/woden/tests/W3CTestSuiteTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/tests/W3CTestSuiteTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/tests/W3CTestSuiteTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/tests/W3CTestSuiteTest.java Tue Jan 23 18:35:28 2007
@@ -21,7 +21,7 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.Description;
public class W3CTestSuiteTest extends TestCase
{
@@ -72,8 +72,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -89,8 +89,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -106,8 +106,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -123,8 +123,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -140,8 +140,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -157,8 +157,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -174,8 +174,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -191,8 +191,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -208,8 +208,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-1B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-1B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -225,8 +225,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-2B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-2B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -242,8 +242,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-12B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-12B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -259,8 +259,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-13B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-13B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -276,8 +276,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-14B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-14B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -293,8 +293,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-15B/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-15B/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -310,8 +310,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
// TODO: determine the assertions that should fail for this test.
}
catch(Exception e)
@@ -333,8 +333,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -350,8 +350,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -367,8 +367,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -384,8 +384,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Chameleon-4G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -401,8 +401,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good CreditCardFaults-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -418,11 +418,11 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl"), handler);
- assertTrue("number of binding elements isn't 1", desc.getBindingElements().length == 1);
- assertTrue("interfacename is null", desc.toComponent().getBindings()[0].getInterface()!=null);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl"), handler);
+ assertTrue("number of bindings isn't 1", desc.getBindings().length == 1);
+ assertTrue("interfacename is null", desc.getBindings()[0].getInterface()!=null);
- assertNotNull("DescriptionElement is null.", desc);
+ assertNotNull("Description is null.", desc);
assertFalse("The good GreatH-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -438,8 +438,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Import-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -455,8 +455,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Import-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -472,8 +472,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ImportedWSDL-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.errorMessageHasBeenReported());
}
catch(Exception e)
@@ -489,8 +489,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-1G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-1G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -506,8 +506,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-2G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-2G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -523,8 +523,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-3G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-3G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -540,8 +540,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-4G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-4G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-4G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -557,8 +557,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-5G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-5G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-5G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -574,8 +574,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-6G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-6G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-6G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -591,8 +591,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-7G/Interface.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-7G/Interface.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Interface-7G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -608,8 +608,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good MultipleInlineSchemas-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -625,8 +625,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good SchemaId-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -642,8 +642,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good SchemaLocationFragment-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -659,8 +659,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-1G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-1G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -676,8 +676,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-2G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-2G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -693,8 +693,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-3G/Service.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-3G/Service.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good Service-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -710,8 +710,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ServiceReference-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -727,8 +727,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good ServiceReference-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -744,8 +744,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good TicketAgent-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -761,8 +761,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good WeathSvc-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -778,8 +778,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-1G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -795,8 +795,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-2G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
@@ -812,8 +812,8 @@
{
try
{
- DescriptionElement desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl"), handler);
- assertNotNull("DescriptionElement is null.", desc);
+ Description desc = reader.readWSDL(wfr.getFilePath("http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl"), handler);
+ assertNotNull("Description is null.", desc);
assertFalse("The good XsImport-3G test returned errors. " + handler.getSummaryOfMessageKeys(), handler.messageHasBeenReported());
}
catch(Exception e)
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -28,7 +28,6 @@
import org.apache.woden.wsdl20.Binding;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of HTTPBindingExtensions.
@@ -62,9 +61,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
fBindings = descComp.getBindings();
assertEquals("The Description should contain 3 Binding components.", 3, fBindings.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org